rrootfsinstall: use dnf instead of smart

This commit is contained in:
Silvan Calarco 2019-08-08 23:36:08 +02:00
parent 41efc993de
commit 4a53062e08

View File

@ -431,12 +431,12 @@ if [ "$INSTALLPACKAGES" -a "$LOCALONLY" != "1" -a ! "${IMAGEMODE}" ]; then
cp /etc/resolv.conf $ROOTMP/etc/resolv.conf cp /etc/resolv.conf $ROOTMP/etc/resolv.conf
chroot $ROOTMP bash -c /etc/profile.d/gpg-key-openmamba.sh chroot $ROOTMP bash -c /etc/profile.d/gpg-key-openmamba.sh
#chroot $ROOTMP smart channel --enable devel-kernel #chroot $ROOTMP smart channel --enable devel-kernel
chroot $ROOTMP smart update || { chroot $ROOTMP dnf update -y || {
echo "ERROR: error running chroot command 'smart update'; aborting." echo "ERROR: error running chroot command 'dnf update -y'; aborting."
exit 1 exit 1
} }
chroot $ROOTMP smart install -y $INSTALLPACKAGES || { chroot $ROOTMP dnf install -y $INSTALLPACKAGES || {
echo "ERROR: error running chroot command 'smart install $INSTALLPACKAGES'; aborting." echo "ERROR: error running chroot command 'dnf install -y $INSTALLPACKAGES'; aborting."
exit 1 exit 1
} }
#chroot $ROOTMP smart channel --disable devel-kernel #chroot $ROOTMP smart channel --disable devel-kernel
@ -444,7 +444,7 @@ if [ "$INSTALLPACKAGES" -a "$LOCALONLY" != "1" -a ! "${IMAGEMODE}" ]; then
fi fi
if [ "$REMOVEPACKAGES" -a ! "${IMAGEMODE}" ]; then if [ "$REMOVEPACKAGES" -a ! "${IMAGEMODE}" ]; then
chroot $ROOTMP smart remove -y $REMOVEPACKAGES 2>/dev/null || true chroot $ROOTMP dnf remove -y $REMOVEPACKAGES 2>/dev/null || true
fi fi
KERNELDEST=`echo $KERNELDEST | sed "s|@BOOT@|$BOOTMP|g"` KERNELDEST=`echo $KERNELDEST | sed "s|@BOOT@|$BOOTMP|g"`