X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-ian;h=72dc7ec64d57f42ee0879e92f905a66c84c3fdaa;hb=645ab36988f8eed2e85d066bdf1ad8a12e7aabc0;hp=866cc6f3fc670933209a4bd92459c48e9c969876;hpb=a018c3030b0ebd751d5667efd96c2fd32f2423e0;p=automated-distro-installer

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 866cc6f..72dc7ec 100755
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -30,57 +30,56 @@ EOFOUTER
 fcopy -riB /boot
 # this is also done by FABASE/10-misc by default.
 fcopy -riB /root
-if ifclass STABLE_BOOTSTRAP; then
+
+
+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
 
-bind-common() {
-    src=$1
-    dst=$2
-    if [[ ! -e $dst && -e $src ]]; then
-      mkdir -p $dst
-      mount -o bind $src $dst
-    fi
-
-}
-bind-common $FAI/distro-install-common/shadow /q/root/shadow
-
-# todo, port this over to the arch install script.
-cp -rT $FAI/distro-install-common/p/c/machine_specific/$HOSTNAME/filesystem/etc/ssh /target/etc/ssh
-
-$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 -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
 
-fcopy -riB /etc/ssh
 
 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
@@ -95,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