fixes mostly for bootstrap vol, better docs

[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 6a55e4406455b436292444cba56a344a7705a23d..0a3bbdb959dd10fd037b537927428305c121aeb6 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -30,13 +30,6 @@ EOFOUTER
 fcopy -riB /boot
 # this is also done by FABASE/10-misc by default.
 fcopy -riB /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
 
 
 src=$FAI/distro-install-common/shadow
@@ -51,9 +44,20 @@ 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
+  cp -rT $src $dst
 fi
 
+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
+
+
 $FAI/distro-install-common/end
 
 # these get copied in an earlier stage by fai, but leaving it here since
@@ -65,7 +69,6 @@ fcopy -riB /etc/apt
 sleep 1
 $ROOTCMD apt-get update
 
-fcopy -riB /etc/ssh
 
 chroot $FAI_ROOT bash <<'EOF'
 set -eE -o pipefail