ssh key fix, consistent help args

[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 0a3bbdb959dd10fd037b537927428305c121aeb6..8df5b13147a5412e00ce03b7d19c35da2883e1f7 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/11-ian
+++ b/fai/config/scripts/GRUB_PC/11-ian
@@ -39,27 +39,17 @@ if [[ ! -e $dst && -e $src ]]; then
   mkdir -p $dst
   mount -o bind $src $dst
 fi
-# 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 -riB /etc/ssh
 
+$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
 
 
-$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