openmamba/usbinstall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rootfsinstall.sh: support for /etc/resolv.conf as systemd symlink; rpi4: enable fkms overlay

Browse Source
This commit is contained in:
Silvan Calarco 2021-04-27 00:07:51 +02:00
parent de8deb26fa
commit f58045a760
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rootfsinstall.sh
View File

@ -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 "\