remove option to never upgrade ucf files

[automated-distro-installer] / fai-redep

diff --git a/fai-redep b/fai-redep
index 9a455c9c0cc6d01f30e8b0a0469e6c18a22fbc1a..7dc0d097496e679750ad4437ee5a2acdce5026de 100755 (executable)
--- a/fai-redep
+++ b/fai-redep
@@ -38,10 +38,10 @@ host=${1:-faiserver}
 # use it, so look it up just to avoid the warning spam.
 faiserver_host=$(chost $host) || faiserver_host=$host
 
-rsync -rl --delete --relative --exclude /fai/config/basefiles/ fai/config root@$faiserver_host:/srv
+rsync -rlp --delete --relative --exclude /fai/config/basefiles/ fai/config root@$faiserver_host:/srv
 
 
-scp -q ~/.ssh/id_rsa.pub \
+scp -q ~/.ssh/home.pub \
     root@$faiserver_host:/srv/fai/config/files/root/.ssh/authorized_keys/GRUB_PC
 # todo: automatically disable faiserver after a period so
 # these files are not exposed.
@@ -53,7 +53,7 @@ tar -cz /p/c/machine_specific/*/filesystem/etc/ssh | \
   ssh root@$faiserver_host tar -xz -C /srv/fai/config/distro-install-common
 
 
-# built BELANOS basefile with mk-basefile -J BELENOS64. it's stored in
+# built BELENOS basefile with mk-basefile -J BELENOS64. it's stored in
 # it's own repo which is published alongside this one called
 # fai-basefiles due to being a large binary file.