X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-iank;h=089f0cb805125e9140f0d791107a96a0c289022f;hb=2230b58f86d24175583f2ce60d271f66d4f122ea;hp=1849d60299660a467be6e79cfd3257d6be068638;hpb=955824332a28a4b7dc6683808274bd6302c7ead1;p=automated-distro-installer diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank index 1849d60..089f0cb 100755 --- a/fai/config/scripts/GRUB_PC/11-iank +++ b/fai/config/scripts/GRUB_PC/11-iank @@ -41,7 +41,7 @@ $FAI/distro-install-common/end -if ifclass VOL_STRETCH_BOOTSTRAP; then +if ifclass VOL_BUSTER_BOOTSTRAP; then fcopy -riM /etc/systemd/system chroot $FAI_ROOT bash <<'EOFOUTER' systemctl enable fai_check.service @@ -53,7 +53,8 @@ fi # these get copied in an earlier stage by fai, but leaving it here since # I run this as a single post-fai script to update things that have changed. tmpfile1=$(mktemp) -chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile1 +# this can fail if we need an apt update +chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile1 ||: fcopy -riBM /etc/apt tmpfile2=$(mktemp) chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile2 @@ -117,7 +118,6 @@ sudo -u iank mkdir -p $d sudo -u iank ln -sf /usr/lib/systemd/user/ssh-agent.service $d #### end .ssh setup ### - ## duplicated in ssh-emacs-setup # done here so its setup earlier for convenience line='AcceptEnv INSIDE_EMACS BRC COLUMNS' @@ -247,6 +247,15 @@ EOF [main] dns=systemd-resolved EOF + if [[ $HOSTNAME == frodo ]]; then + cat > $target/etc/network/interfaces <<-EOF +# generated by FAI +auto lo eth0 +iface lo inet loopback +iface eth0 inet static +address 10.3.0.2/16 +EOF + fi else cat > $target/etc/network/interfaces <<-EOF