X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-ian;h=0a3bbdb959dd10fd037b537927428305c121aeb6;hb=83828fe2683227f4d8ecb2343eff28439741b490;hp=e27e394e8ac3509032d1ab194fc8c35812ebee92;hpb=d0b6a8cd4608fdffcf733f9180744819d8889be0;p=automated-distro-installer

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index e27e394..0a3bbdb 100755
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -4,41 +4,71 @@ set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 if [[ $EUID != 0 ]]; then
-    echo "$0: error: expected to be root."
-    exit 1
+  echo "$0: error: expected to be root."
+  exit 1
 fi
 
 if ! type -t fcopy &>/dev/null; then
-    sudo apt-get -y install fai-client
+  sudo apt-get -y install fai-client
 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
+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
-$FAI/distro-install-common/end
-
-if ifclass STABLE || ifclass LINODESTABLE; then
-    fcopy -M /etc/apt/preferences
+debconf-set-selections <<EOF
+kexec-tools kexec-tools/load_kexec boolean false
+EOF
+apt-get install -y pxe-kexec
+EOFOUTER
+
+# -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 -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
-
-if ifclass DEBIAN; then
-    fcopy -M /etc/apt/preferences.d/unstable
+# todo, port this over to the arch install script.
+src=$FAI/distro-install-common/p/c/machine_specific/$HOSTNAME/filesystem/etc/ssh
+dst=/target/etc/ssh
+if [[ -e $src && -e $dst ]]; then
+  # outside of fai context, we skip this
+  cp -rT $src $dst
 fi
-fcopy -riM /etc/apt/sources.list.d
-$ROOTCMD apt-get update
 
+fcopy -riB /etc/ssh
+
+if ifclass VOL_STABLE_BOOTSTRAP; then
+  fcopy -ri /etc/systemd/system
+  chroot $FAI_ROOT bash <<'EOFOUTER'
+systemctl enable fai_check.service
+EOFOUTER
+  exit 0
+fi
 
 
-# note:
-# fcopy -i = ignore nonmatching class error, always return 0.
+$FAI/distro-install-common/end
 
-# for lj, this will be empty and fail
-fcopy -riM /home/ian/.ssh
+# 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
 
-rm -f $FAI_ROOT/etc/apt/sources.list
 
 chroot $FAI_ROOT bash <<'EOF'
 set -eE -o pipefail
@@ -60,9 +90,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
@@ -81,4 +108,3 @@ EOF
 for g in plugdev audio video cdrom; do
     $ROOTCMD usermod -a -G $g traci
 done
-