From: Ian Kelling Date: Tue, 13 Aug 2024 03:30:22 +0000 (-0400) Subject: minor fixes X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=d0e0ac8d9c4d39dceafbb45e9775090b2015ea66;p=automated-distro-installer minor fixes --- diff --git a/fai/config/scripts/IANK/11-iank b/fai/config/scripts/IANK/11-iank index ec50ff7..1bb328b 100755 --- a/fai/config/scripts/IANK/11-iank +++ b/fai/config/scripts/IANK/11-iank @@ -360,6 +360,12 @@ for g in plugdev audio video cdrom; do $ROOTCMD usermod -a -G $g user2 done + +# on server, we don't use btrfs, don't need a new kernel afaik. +if [[ $HOSTNAME == li ]]; then + exit 0 +fi + ## begin get new kernel and btrfs-progs ## case $HOSTNAME in sy|so) @@ -369,7 +375,7 @@ case $HOSTNAME in *) if ! $ROOTCMD dpkg -s -- freesh-archive-keyring 2>&1 | grep -Fx "Status: install ok installed" &>/dev/null; then apt-get -y install wget - wget -O /target/tmp/x.deb https://linux-libre.fsfla.org/pub/linux-libre/freesh/pool/main/f/freesh-archive-keyring/freesh-archive-keyring_1.1_all.deb + wget -O $target/tmp/x.deb https://linux-libre.fsfla.org/pub/linux-libre/freesh/pool/main/f/freesh-archive-keyring/freesh-archive-keyring_1.1_all.deb $ROOTCMD dpkg -i /tmp/x.deb $ROOTCMD apt-get update $ROOTCMD apt-get -y install linux-libre @@ -404,10 +410,11 @@ if [[ $ver != "$cur_ver" ]]; then else $ROOTCMD apt-get -y build-dep btrfs-progs fi - # no docs cuz I didn't want to bother fixing error of missing docs dependencies + # note: docs requirements are installed when we have a full distro, so + # at some point, fix the build for early distro. $ROOTCMD bash -xe <