improve code style

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index 547689d462ae2f550eae0b07b1d839ebb62ab5cf..6f8beeb6c326f521872634fce90e3ecaa072745a 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -34,7 +34,7 @@ then start a virtual machine to test the config
 Note, sometimes shutting down the existing demohost vm
 fails. Just run again if that happens.
 
 Note, sometimes shutting down the existing demohost vm
 fails. Just run again if that happens.
 

--r         Do not reboot.
+-r         Do not boot after install is complete

 -n         Create new qcow2(s) for vm
 -h|--help  Print help and exit.
 
 -n         Create new qcow2(s) for vm
 -h|--help  Print help and exit.
 


@@ -44,16 +44,13 @@ EOF
 }
 
 
 }
 
 

-# not sure why I wanted to have this option before. oh well.
-redeploy=true
-
-reboot=true
-temp=$(getopt -l opt o "$@") || usage 1
+new_disk=false
+temp=$(getopt -l help hnr "$@") || usage 1

 eval set -- "$temp"
 while true; do
     case $1 in
         -n) new_disk=true; shift ;;
 eval set -- "$temp"
 while true; do
     case $1 in
         -n) new_disk=true; shift ;;

-        -r) reboot=false; shift ;;
+        -r) reboot_arg=--noreboot; shift ;;

         -h|--help) usage ;;
         --) shift; break ;;
         *) echo "$0: Internal error!" ; exit 1 ;;
         -h|--help) usage ;;
         --) shift; break ;;
         *) echo "$0: Internal error!" ; exit 1 ;;


@@ -61,10 +58,6 @@ while true; do
 done
 
 
 done
 
 

-if [[ $1 == -r ]]; then
-    redeploy=false
-fi
-

 # change this to test different disk counts. 1 and > 1 should be the only
 # important things to test.
 disk_count=1
 # change this to test different disk counts. 1 and > 1 should be the only
 # important things to test.
 disk_count=1


@@ -85,19 +78,19 @@ 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=ubuntu16.04
+    # 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
 
     #variant=debian8
 fi
 


@@ -126,7 +119,7 @@ fi
 #
 # uniq is to stop gtk-warning spam
 e s virt-install --os-variant $variant  -n $name --pxe -r 2048 --vcpus 1 \
 #
 # uniq is to stop gtk-warning spam
 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 \
+  ${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad $reboot_arg \

   --graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^ *$' | uniq &
 
 if [[ $SSH_CLIENT ]]; then
   --graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^ *$' | uniq &
 
 if [[ $SSH_CLIENT ]]; then


@@ -136,9 +129,10 @@ fi
 sleep 30
 while ! timeout -s 9 10 ssh root@$name /bin/true; do
     e sleep 5
 sleep 30
 while ! timeout -s 9 10 ssh root@$name /bin/true; do
     e sleep 5

+    khfix root@$name ||:

 done
 cleanup() { :; }
 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