X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-ian;h=8df5b13147a5412e00ce03b7d19c35da2883e1f7;hb=875cea0c266c7802b336f5a8b61b63e109e670fb;hp=199e4f860745ac55c1eb4ac23fc3509d08cfcb58;hpb=d6df8985152a6c17523cedc3fee62694544eeaf2;p=automated-distro-installer

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 199e4f8..8df5b13 100755
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -8,48 +8,58 @@ if [[ $EUID != 0 ]]; then
   exit 1
 fi
 
-
 if ! type -t fcopy &>/dev/null; then
   sudo apt-get -y install fai-client
 fi
 
 chroot $FAI_ROOT bash <<'EOFOUTER'
+if getent group systemd-journal >/dev/null; then
+  # makes the journal be saved to disk.
+  mkdir -p /var/log/journal
+  chmod 755 /var/log/journal
+fi
 debconf-set-selections <<EOF
 kexec-tools kexec-tools/load_kexec boolean false
 EOF
 apt-get install -y pxe-kexec
 EOFOUTER
 
-# note: # fcopy -i = ignore nonmatching class error, always return 0.
+# -r = recursive
+# -i = ignore non-matching class warnings, always exit 0
+# -B = no backup files
+fcopy -riB /boot
 # this is also done by FABASE/10-misc by default.
-fcopy -ir /root
-if ifclass STABLE_BOOTSTRAP; then
+fcopy -riB /root
+
+
+src=$FAI/distro-install-common/shadow
+dst=/q/root/shadow
+if [[ ! -e $dst && -e $src ]]; then
+  # outside of fai context, we skip this
+  mkdir -p $dst
+  mount -o bind $src $dst
+fi
+
+$FAI/distro-install-common/end
+if ifclass VOL_STABLE_BOOTSTRAP; then
   fcopy -ri /etc/systemd/system
   chroot $FAI_ROOT bash <<'EOFOUTER'
 systemctl enable fai_check.service
 EOFOUTER
-  exit 0
+  exit 0 # avoid unnecessary stuff in bootstrap vol
 fi
 
-dir=/q/root/shadow
-fai_shadow=$FAI/distro-install-common/shadow
-if [[ ! -e $dir && -e $fai_shadow ]]; then
-  mkdir -p $dir
-  mount -o bind $fai_shadow $dir
-fi
-$FAI/distro-install-common/end
-
 
 # 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.
-fcopy -ri /etc/apt/preferences.d
-fcopy -ri /etc/apt/sources.list.d
+fcopy -riB /etc/apt
+# outside of fai, this seems to regularly lead to
+# E: Could not get lock /var/lib/apt/lists/lock - open (11: Resource temporarily unavailable)
+# so add a sleep. 1 sec is probably way more than needed.
+sleep 1
 $ROOTCMD apt-get update
 
 
-
-rm -f $FAI_ROOT/etc/apt/sources.list
-
 chroot $FAI_ROOT bash <<'EOF'
 set -eE -o pipefail
 mkdir -p /home/ian/.ssh
@@ -70,9 +80,6 @@ usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev ian
 
 if getent group systemd-journal >/dev/null; then
   usermod -aG systemd-journal ian
-  # makes the journal be saved to disk.
-  mkdir -p /var/log/journal
-  chmod 755 /var/log/journal
 fi
 # https://askubuntu.com/questions/33416/how-do-i-disable-the-boot-splash-screen-and-only-show-kernel-and-boot-text-inst
 # it suggests not having plymouth-theme-ubuntu-text, but