X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fdistro-install-common%2Fend;h=90082de579047090c387b05f944cb5f710e9cb80;hb=875cea0c266c7802b336f5a8b61b63e109e670fb;hp=629e47ad5ee9c7e727cba56da2611eeab58a5dab;hpb=bdcc37dee90597b4a65c2ae24b9fc26f15adfc11;p=automated-distro-installer diff --git a/fai/config/distro-install-common/end b/fai/config/distro-install-common/end index 629e47a..90082de 100755 --- a/fai/config/distro-install-common/end +++ b/fai/config/distro-install-common/end @@ -8,6 +8,19 @@ if [[ $EUID != 0 ]]; then exit 1 fi +# ssh host keys +# note, $BASH_SOURCE is not defined here under fai. +src=$(dirname "$0")/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 + +if ifclass VOL_STABLE_BOOTSTRAP; then + exit 0 +fi + TPW=/q/root/shadow/traci-simple if ifclass tp; then ROOTPW="$TPW" @@ -66,16 +79,6 @@ if [[ ! -e $f ]] || ! grep -xF "$line" $f; then echo "$line" >> $f fi -# ssh host keys -# note, $BASH_SOURCE is not defined here under fai. -src=$(dirname "$0")/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 - - dir=/p/c/machine_specific/$HOSTNAME/.unison $ROOTCMD mkdir -p $dir if ! $ROOTCMD test -L /root/.unison; then