X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-iank;h=9b71647277af0bfb687f41f3dde5f46b82f574ff;hb=b5682902b6dce0a3d799e129877c8b43c4509774;hp=ce78c153ac1e4802d25ba2d00d39776c39d34646;hpb=a921cf8d08ad2840f2b62236e308aba9d04c30ba;p=automated-distro-installer

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index ce78c15..9b71647 100755
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -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'
@@ -144,9 +144,18 @@ sed -i '$a kernel.sysrq=1
 EOFOUTER
 
 
+rm -f $target/etc/resolv.conf
+ln -s ../run/systemd/resolve/stub-resolv.conf $target/etc/resolv.conf
+# needed for bitfolk image
+if [[ -e /a/bin/fai/fai-wrapper ]]; then
+  systemctl enable systemd-resolved
+  systemctl start systemd-resolved
+fi
+
+
 # bitfolk installer handles the rest
 case $HOSTNAME in
-  bk) exit 0 ;;
+  bk|je) exit 0 ;;
 esac
 
 
@@ -238,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
@@ -263,14 +281,6 @@ EOF
 
 fi
 
-rm -f $target/etc/resolv.conf
-ln -s ../run/systemd/resolve/stub-resolv.conf $target/etc/resolv.conf
-# needed for bitfolk image
-if [[ -e /a/bin/fai/fai-wrapper ]]; then
-  systemctl enable systemd-resolved
-  systemctl start systemd-resolved
-fi
-
 if ifclass LINODE; then
   mkdir -p $target/etc/initramfs-tools/conf.d
   cat >$target/etc/initramfs-tools/conf.d/mine <<EOF