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

diff --git a/fai/config/scripts/GRUB_PC/11-ian b/fai/config/scripts/GRUB_PC/11-ian
index 3be239f..199e4f8 100755
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -8,9 +8,10 @@ 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'
 debconf-set-selections <<EOF
@@ -19,14 +20,17 @@ 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 +39,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'
@@ -91,4 +91,3 @@ EOF
 for g in plugdev audio video cdrom; do
     $ROOTCMD usermod -a -G $g traci
 done
-