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
fix bad merge of upstream config
[automated-distro-installer]
/
fai-redep
diff --git
a/fai-redep
b/fai-redep
index 8e5919d9561ab05223a6cb18e4a01b9f38fcc8ff..b90b30a285ca5d6654d8191428ec79d97c6f8392 100755
(executable)
--- a/
fai-redep
+++ b/
fai-redep
@@
-80,6
+80,7
@@
m rsync -rlpt --delete --relative --exclude /fai/config/basefiles/ fai/config "$
# todo: automatically disable faiserver after a period so
# these files are not available.
# todo: automatically disable faiserver after a period so
# these files are not available.
+
if [[ $target ]]; then
secret_files=(luks/$target luks/host-$target shadow/$target)
exists=false
if [[ $target ]]; then
secret_files=(luks/$target luks/host-$target shadow/$target)
exists=false
@@
-101,7
+102,10
@@
else
rsync -rlpt /q/root/shadow /q/root/luks "${rpre[@]}"/srv/fai/config/distro-install-common
fi
rsync -rlpt /q/root/shadow /q/root/luks "${rpre[@]}"/srv/fai/config/distro-install-common
fi
-rsync -rlpt --delete /a/opt/btrfs-progs-release "${rpre[@]}"/srv/fai/config/distro-install-common
+rsync -rlpt --delete /a/opt/btrfs-progs-release \
+ filesystem/usr/local/bin/ethusb-nm \
+ filesystem/usr/local/bin/ethusb-static \
+ "${rpre[@]}"/srv/fai/config/distro-install-common
dirs=(/p/c/machine_specific/${target:-*}/filesystem/etc/ssh)
if [[ -e ${dirs[0]} ]]; then
dirs=(/p/c/machine_specific/${target:-*}/filesystem/etc/ssh)
if [[ -e ${dirs[0]} ]]; then