rename ian to iank

[automated-distro-installer] / fai / config / scripts / GRUB_PC / 11-ian

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 765034041aedc7b3f2e4a0305ce9447e5cdeed19..72dc7ec64d57f42ee0879e92f905a66c84c3fdaa 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -24,57 +24,62 @@ EOF
 apt-get install -y pxe-kexec
 EOFOUTER
 
-fcopy -r /boot # -r = recursive
-# 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
+mkdir -p /home/iank/.ssh
 f=/root/.ssh/authorized_keys
 if [[ -e $f ]]; then
-   cp $f /home/ian/.ssh
+   cp $f /home/iank/.ssh
 fi
-chown -R 1000:1000 /home/ian/.ssh
-chmod -R u=Xrw,og= /home/ian/.ssh
+chown -R 1000:1000 /home/iank/.ssh
+chmod -R u=Xrw,og= /home/iank/.ssh
 rm -rf /root/.ssh
-cp -rL /home/ian/.ssh /root
+cp -rL /home/iank/.ssh /root
 chown -R root:root /root/.ssh
 chmod 700 /root/.ssh
 
 
 # default jessie groups + kvm, systemd-journal, adm
-usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev ian
+usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev iank
 
 if getent group systemd-journal >/dev/null; then
-  usermod -aG systemd-journal ian
+  usermod -aG systemd-journal iank
 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
@@ -89,7 +94,7 @@ update-grub2
 EOF
 
 
-# reading through the groups that ian is in but traci isn't,
+# reading through the groups that iank is in but traci isn't,
 for g in plugdev audio video cdrom; do
     $ROOTCMD usermod -a -G $g traci
 done