diff --git a/src/rootfsinstall.sh b/src/rootfsinstall.sh index 13649d3..3b1f63a 100755 --- a/src/rootfsinstall.sh +++ b/src/rootfsinstall.sh @@ -452,14 +452,16 @@ if [ "$SETHOSTNAME" ]; then fi if [ "$INSTALLPACKAGES" -a "$LOCALONLY" != "1" -a ! "${IMAGEMODE}" ]; then - mv $ROOTMP/etc/resolv.conf $ROOTMP/etc/resolv.conf.rootfsinstall - cp /etc/resolv.conf $ROOTMP/etc/resolv.conf + if [ ! -L $ROOTMP/etc/resolv.conf ]; then + mv $ROOTMP/etc/resolv.conf $ROOTMP/etc/resolv.conf.rootfsinstall + cp /etc/resolv.conf $ROOTMP/etc/resolv.conf + fi chroot $ROOTMP bash -c /etc/profile.d/gpg-key-openmamba.sh #chroot $ROOTMP smart channel --enable devel-kernel chroot $ROOTMP rpm --rebuilddb || { echo "ERROR: error running chroot command 'rpm --rebuilddb'; aborting." exit 1 - } + } chroot $ROOTMP dnf update --nogpgcheck -y || { echo "ERROR: error running chroot command 'dnf update --nogpgcheck -y'; aborting." exit 1 @@ -470,7 +472,7 @@ if [ "$INSTALLPACKAGES" -a "$LOCALONLY" != "1" -a ! "${IMAGEMODE}" ]; then exit 1 } #chroot $ROOTMP smart channel --disable devel-kernel - mv $ROOTMP/etc/resolv.conf.rootfsinstall $ROOTMP/etc/resolv.conf + [ -e $ROOTMP/etc/resolv.conf.rootfsinstall ] && mv $ROOTMP/etc/resolv.conf.rootfsinstall $ROOTMP/etc/resolv.conf fi if [ "$REMOVEPACKAGES" -a ! "${IMAGEMODE}" ]; then @@ -599,7 +601,10 @@ framebuffer_ignore_alpha=1 dtparam=audio=on" > $BOOTMP/config.txt if [ "$TARGETDEVICE" = "rpi64" ]; then - echo "arm_64bit=1" >> $BOOTMP/config.txt + echo "\ +gpu_mem=128 +dtoverlay=vc4-fkms-v3d +arm_64bit=1" >> $BOOTMP/config.txt fi ## Enable HDMI mode rather than DVI, if required #echo "\