sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Work around yum/dnf differences"

Browse Source
This commit is contained in:
Jenkins 2015-07-17 23:44:43 +00:00 committed by Gerrit Code Review
commit 61914629f1
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
elements/rpm-distro/pre-install.d/01-override-yum-arch
View File

@ -25,5 +25,11 @@ else
exit 1 exit 1
fi fi
echo $basearch > /etc/yum/vars/basearch if [ $DIB_RELEASE -ge 22 ]; then
echo $arch > /etc/yum/vars/arch mkdir -p /etc/dnf/vars
echo $basearch > /etc/dnf/vars/basearch
echo $arch > /etc/dnf/vars/basearch
else
echo $basearch > /etc/yum/vars/basearch
echo $arch > /etc/yum/vars/arch
fi

10
elements/yum/post-install.d/99-reset-yum-conf
View File

@ -6,5 +6,11 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
sed -i 's/keepcache=1/keepcache=0/' /etc/yum.conf if [ $DIB_RELEASE -ge 22 ]; then
sed -i 's/cachedir=\/tmp\/yum/cachedir=\/var\/cache\/yum/' /etc/yum.conf cfg=/etc/dnf/dnf.conf
else
cfg=/etc/yum.conf
fi
sed -i 's/keepcache=1/keepcache=0/' $cfg
sed -i 's/cachedir=\/tmp\/yum/cachedir=\/var\/cache\/yum/' $cfg

13
elements/yum/pre-install.d/01-yum-keepcache
View File

@ -6,5 +6,14 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
sed -i 's/keepcache=0/keepcache=1/' /etc/yum.conf if [ $DIB_RELEASE -ge 22 ]; then
sed -i 's/cachedir=\/var\/cache\/yum/cachedir=\/tmp\/yum/' /etc/yum.conf # dnf is slightly different; doesn't have these by default
cfg=/etc/dnf/dnf.conf
echo "keepcache=1" >> $cfg
echo "cachedir=/tmp/yum" >> $cfg
else
cfg=/etc/yum.conf
sed -i 's/keepcache=0/keepcache=1/' $cfg
sed -i 's/cachedir=\/var\/cache\/yum/cachedir=\/tmp\/yum/' $cfg
fi