Blame singularity-release.patch
|
Dave Love |
3de031c |
diff --git a/libexec/mods/linux_build_redhat.smod b/libexec/mods/linux_build_redhat.smod
|
|
Dave Love |
3de031c |
index d51c373..52748da 100644
|
|
Dave Love |
3de031c |
--- a/libexec/mods/linux_build_redhat.smod
|
|
Dave Love |
3de031c |
+++ b/libexec/mods/linux_build_redhat.smod
|
|
Dave Love |
3de031c |
@@ -28,9 +28,6 @@ if ! YUM_PATH=`singularity_which dnf` &&
|
|
Dave Love |
3de031c |
fi
|
|
Dave Love |
3de031c |
|
|
Dave Love |
3de031c |
|
|
Dave Love |
3de031c |
-RELEASE_PKG=`rpm -qf /etc/redhat-release --qf '%{NAME}\n'`
|
|
Dave Love |
3de031c |
-
|
|
Dave Love |
3de031c |
-
|
|
Dave Love |
3de031c |
REPO_NAME="os-base"
|
|
Dave Love |
3de031c |
YUM_CONF="/etc/bootstrap-yum.conf"
|
|
Dave Love |
3de031c |
|
|
Dave Love |
3de031c |
@@ -75,8 +72,9 @@ Setup() {
|
|
Dave Love |
3de031c |
|
|
Dave Love |
3de031c |
Bootstrap() {
|
|
Dave Love |
e11f87a |
# Avoid plugins which might cause trouble, e.g. etckeeper, Red Hat
|
|
Dave Love |
3de031c |
- # subscription-manager.
|
|
Dave Love |
3de031c |
- if ! eval "$YUM_PATH --noplugins -c $SINGULARITY_BUILD_ROOT/$YUM_CONF --tolerant --installroot $SINGULARITY_BUILD_ROOT -y install $RELEASE_PKG redhat-release coreutils $@"; then
|
|
Dave Love |
3de031c |
+ # subscription-manager. Install the release file, as the name of
|
|
Dave Love |
3de031c |
+ # the release package varies between RHEL, CentOS, etc.
|
|
Dave Love |
3de031c |
+ if ! eval "$YUM_PATH --noplugins -c $SINGULARITY_BUILD_ROOT/$YUM_CONF --tolerant --installroot $SINGULARITY_BUILD_ROOT -y install /etc/redhat-release coreutils $@"; then
|
|
Dave Love |
3de031c |
exit 1
|
|
Dave Love |
3de031c |
fi
|
|
Dave Love |
3de031c |
|