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
Merge branch 'upstream'
[automated-distro-installer]
/
faiserver-revm
diff --git
a/faiserver-revm
b/faiserver-revm
index 1065f3b84b45fd3648114aa6c74ce2819f153c82..a0a0bb8b421ecf11ea4b666ec683bff61c386944 100755
(executable)
--- a/
faiserver-revm
+++ b/
faiserver-revm
@@
-10,7
+10,7
@@
set -eE -o pipefail
cleanup() { :; }
trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
cleanup() { :; }
trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
-cd "${BASH_SOURCE%/*}"
+x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
cleanup() { pxe-server :; }
./debian-pxe-preseed -i 192.168.1.1 -u ian -g vda
cleanup() { pxe-server :; }
./debian-pxe-preseed -i 192.168.1.1 -u ian -g vda
@@
-34,6
+34,6
@@
done
# note: with a vm, pxe boot is turned off in the bios after it's first reboot.
cleanup() { :; }
# note: with a vm, pxe boot is turned off in the bios after it's first reboot.
cleanup() { :; }
-./pxe-server
:
+./pxe-server
ssh $opts root@faiserver ./faiserver-setup
ssh $opts root@faiserver ./faiserver-setup