X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-redep;h=e7aab6d221f564f1664c20dbcc35a3bb156f59aa;hb=dcc5f68f7fbe9aa86cb3c7402ba4429bd70b369d;hp=c90aea8b8bde2398222bdafa3b4923039deff7c6;hpb=ee37d990c89bb3bab1b54e3b3fb43e9f79ed039b;p=automated-distro-installer

diff --git a/fai-redep b/fai-redep
index c90aea8..e7aab6d 100755
--- a/fai-redep
+++ b/fai-redep
@@ -11,6 +11,10 @@ usage() {
 usage: ${0##*/} [OPTIONS] [HOST]
 Deploy fai config (the one in nfs) to HOST or default faiserver
 
+Note, for booting from fai-cd, this needs to be called from myfai-chboot or that via pxe-server,
+due to setting
+echo FAI_ACTION=$fai_action >> /srv/fai/config/class/LAST.var
+note FAI_ACTION might be able to be set elsewhere, like in grub for this case
 
 -d DISTRO      DISTRO for setting up fai class DESKTOP packages, for preinstalling stuff.
 -t TARGET_HOST Copy only secrets for TARGET_HOST into the config space. Useful for virtual server
@@ -59,10 +63,13 @@ sudo rsync -a /root/.ssh/home.pub \
 # these files are not available.
 
 if [[ $target ]]; then
+  if sudo test -e /q/root/shadow/$target; then
+    shadowfile=shadow/$target # empty otherwise
+  fi
   sudo rsync -lpt --files-from=- /q/root root@$faiserver_host:/srv/fai/config/distro-install-common <<EOF
 luks/$target
 luks/host-$target
-shadow/$target
+$shadowfile
 EOF
 else
   sudo rsync -rlpt /q/root/shadow /q/root/luks root@$faiserver_host:/srv/fai/config/distro-install-common
@@ -80,7 +87,7 @@ printf "%s\n%s\n" "PACKAGES install" ${pall[*]} | \
   ssh root@$faiserver_host dd of=/srv/fai/config/package_config/DESKTOP 2>/dev/null ||: # broken pipe
 
 
-rsync -rplt --delete $BASEFILE_DIR/*.gz root@$faiserver_host:/srv/fai/config/basefiles/
+rsync -rplt --include '/*.gz' --exclude '/**' --delete-excluded $BASEFILE_DIR/ root@$faiserver_host:/srv/fai/config/basefiles/
 ssh root@$faiserver_host bash <<'EOF'
 set -eE -o pipefail
 # make it the root because pxe-kexec only looks there.