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 pxe server leaving background procs
[automated-distro-installer]
/
fai-revm
diff --git
a/fai-revm
b/fai-revm
index 2361ecf662848c825205e65149be54ad96600467..6271a36bfa4980f3be53fa0ca4dd1efe977d4141 100755
(executable)
--- a/
fai-revm
+++ b/
fai-revm
@@
-22,8
+22,12
@@
set -x
# Deploy fai configuration to faiserver,
# then start a virtual machine to test the config.
# Deploy fai configuration to faiserver,
# then start a virtual machine to test the config.
+cleanup() { :; }
set -eE -o pipefail
set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
+
+e() { echo "$*"; "$@"; }
# I had this set false as default before, can't remember why. oh well.
redeploy=true
# I had this set false as default before, can't remember why. oh well.
redeploy=true
@@
-33,7
+37,6
@@
fi
disk_count=2
disk_count=2
-script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
if [[ $script_dir == /a/bin/* ]]; then
# Copy our script elsewhere so we can develop it
if [[ $script_dir == /a/bin/* ]]; then
# Copy our script elsewhere so we can develop it
@@
-53,13
+56,14
@@
is_arch_revm() {
new_disk=false
[[ ! $1 ]] || new_disk=true
new_disk=false
[[ ! $1 ]] || new_disk=true
+cleanup() { ./pxe-server :; }
if is_arch_revm; then
if is_arch_revm; then
- ./pxe-server arch
&
+ ./pxe-server 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
-a fai &
+ ./pxe-server
fai
sleep 2
if $redeploy; then
./fai-redep
sleep 2
if $redeploy; then
./fai-redep
@@
-69,7
+73,7
@@
fi
name=demohost
name=demohost
-s virshrm $name ||:
+
e
s virshrm $name ||:
disk_arg=()
disk_arg=()
@@
-78,7
+82,7
@@
for ((i=1; i <= disk_count; i++)); do
disk_arg+=("--disk path=$f")
if $new_disk || [[ ! -e $f ]]; then
s rm -f $f
disk_arg+=("--disk path=$f")
if $new_disk || [[ ! -e $f ]]; then
s rm -f $f
- s qemu-img create -o preallocation=metadata -f qcow2 $f 20G
+
e
s qemu-img create -o preallocation=metadata -f qcow2 $f 20G
fi
done
fi
done
@@
-91,7
+95,7
@@
fi
# init_module+0x108/0x1000 [raid6_pq]
#
# uniq is to stop gtk-warning spam
# init_module+0x108/0x1000 [raid6_pq]
#
# uniq is to stop gtk-warning spam
-s virt-install --os-variant $variant -n $name --pxe -r 2048 --vcpus 1 \
+
e
s virt-install --os-variant $variant -n $name --pxe -r 2048 --vcpus 1 \
${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad \
--graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^ *$' | uniq &
${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad \
--graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^ *$' | uniq &
@@
-99,8
+103,10
@@
if [[ $SSH_CLIENT ]]; then
fg
fi
fg
fi
-
+sleep 30
+while ! timeout -s 9 10 ssh root@$name /bin/true; do sleep 5; done
+cleanup() { :; }
+pxe-server :
if is_arch_revm; then
if is_arch_revm; then
- while ! timeout -s 9 10 ssh root@$name /bin/true; do sleep 1; done
./arch-init-remote $name
fi
./arch-init-remote $name
fi