various fixes, data subvols changed, mostly handled elsewhere now

[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 3be239f424b1de99488e31aefaf555ef1a885adf..a10efef37e185b42fd8e8a5d40c22b57a4b07a6c 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -8,25 +8,33 @@ if [[ $EUID != 0 ]]; then
   exit 1
 fi
 
-# note:
-# fcopy -i = ignore nonmatching class error, always return 0.
-fcopy -riM /root/.ssh
+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.
+# this is also done by FABASE/10-misc by default.
+fcopy -ir /root
 if ifclass STABLE_BOOTSTRAP; then
+  fcopy -ri /etc/systemd/system
+  chroot $FAI_ROOT bash <<'EOFOUTER'
+systemctl enable fai_check.service
+EOFOUTER
   exit 0
 fi
 
-if ! type -t fcopy &>/dev/null; then
-  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
@@ -35,19 +43,15 @@ if [[ ! -e $dir && -e $fai_shadow ]]; then
 fi
 $FAI/distro-install-common/end
 
-if ifclass STABLE || ifclass LINODESTABLE; then
-  fcopy -M /etc/apt/preferences
-fi
 
-if ifclass DEBIAN; then
-  fcopy -M /etc/apt/preferences.d/unstable
-fi
-fcopy -riM /etc/apt/sources.list.d
+# 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
 $ROOTCMD apt-get update
 
 
 
-
 rm -f $FAI_ROOT/etc/apt/sources.list
 
 chroot $FAI_ROOT bash <<'EOF'
@@ -70,9 +74,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
@@ -91,4 +92,3 @@ EOF
 for g in plugdev audio video cdrom; do
     $ROOTCMD usermod -a -G $g traci
 done
-