iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 6a55e4406455b436292444cba56a344a7705a23d..8df5b13147a5412e00ce03b7d19c35da2883e1f7 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
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
src=$FAI/distro-install-common/shadow
@@
-46,15
+39,16
@@
if [[ ! -e $dst && -e $src ]]; then
mkdir -p $dst
mount -o bind $src $dst
fi
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
-fi
$FAI/distro-install-common/end
$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 # avoid unnecessary stuff in bootstrap vol
+fi
+
# 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.
# 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.
@@
-65,7
+59,6
@@
fcopy -riB /etc/apt
sleep 1
$ROOTCMD apt-get update
sleep 1
$ROOTCMD apt-get update
-fcopy -riB /etc/ssh
chroot $FAI_ROOT bash <<'EOF'
set -eE -o pipefail
chroot $FAI_ROOT bash <<'EOF'
set -eE -o pipefail