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
do not install isc-dhcp & inetd recommended packages
[automated-distro-installer]
/
fai-revm
diff --git
a/fai-revm
b/fai-revm
index d8833ab4b01e2e920f6f31bc2793a64c56f0b763..97b6338ff1f97e9d64871c39ed9f628c98d6c132 100755
(executable)
--- a/
fai-revm
+++ b/
fai-revm
@@
-44,11
+44,9
@@
EOF
}
}
-# not sure why I wanted to have this option before. oh well.
-redeploy=true
-
+new_disk=false
reboot=true
reboot=true
-temp=$(getopt -l
opt o
"$@") || usage 1
+temp=$(getopt -l
help hnr
"$@") || usage 1
eval set -- "$temp"
while true; do
case $1 in
eval set -- "$temp"
while true; do
case $1 in
@@
-61,11
+59,9
@@
while true; do
done
done
-if [[ $1 == -r ]]; then
- redeploy=false
-fi
-
-disk_count=2
+# change this to test different disk counts. 1 and > 1 should be the only
+# important things to test.
+disk_count=1
if [[ $script_dir == /a/bin/* ]]; then
if [[ $script_dir == /a/bin/* ]]; then
@@
-83,19
+79,20
@@
is_arch_revm() {
[[ ${0##*/} == arch-revm ]]
}
[[ ${0##*/} == arch-revm ]]
}
-cleanup() { ./pxe-server
:
; }
+cleanup() { ./pxe-server; }
if is_arch_revm; then
if is_arch_revm; then
- ./pxe-server arch
+ ./pxe-server
demohost
arch
sleep 2
# via osinfo-query os. guessing arch is closest to latest fedora.
variant=fedora22
else
sleep 2
# via osinfo-query os. guessing arch is closest to latest fedora.
variant=fedora22
else
- ./pxe-server fai
+ ./pxe-server
demohost
fai
sleep 2
sleep 2
- if $redeploy; then
- ./fai-redep
- fi
- variant=debian8
+ # I don't think these variants actually make a diff for us, but I
+ # use the appropriate one when trying a new distro just in case.
+ variant=ubuntu14.04
+ #variant=ubuntu16.04
+ #variant=debian8
fi
name=demohost
fi
name=demohost
@@
-135,7
+132,7
@@
while ! timeout -s 9 10 ssh root@$name /bin/true; do
e sleep 5
done
cleanup() { :; }
e sleep 5
done
cleanup() { :; }
-e pxe-server
:
+e pxe-server
if is_arch_revm; then
./arch-init-remote $name
fi
if is_arch_revm; then
./arch-init-remote $name
fi