minor fixes

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index f7e45c9f97b960fa0af105fb9c4378f8c52c1f89..bd9a9d633b70ff1ed650a4e00a986b7705e1282c 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -33,6 +33,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.
 

+-d         Don't do dhcp setup for when we aren't on Ian's home network.

 -r         Do not boot after install is complete
 -n         Create new qcow2(s) for vm. Good for testing partitioning
            script, to ensure a blank disk.
 -r         Do not boot after install is complete
 -n         Create new qcow2(s) for vm. Good for testing partitioning
            script, to ensure a blank disk.


@@ -45,10 +46,11 @@ EOF
 
 orig_args=("$@")
 new_disk=false
 
 orig_args=("$@")
 new_disk=false

-temp=$(getopt -l help hnr "$@") || usage 1
+temp=$(getopt -l help dnrh "$@") || usage 1

 eval set -- "$temp"
 while true; do
     case $1 in
 eval set -- "$temp"
 while true; do
     case $1 in

+        -d) dhcp_arg=-d; shift ;;

         -n) new_disk=true; shift ;;
         -r) reboot_arg=--noreboot; shift ;;
         -h|--help) usage ;;
         -n) new_disk=true; shift ;;
         -r) reboot_arg=--noreboot; shift ;;
         -h|--help) usage ;;


@@ -57,6 +59,7 @@ while true; do
     esac
 done
 
     esac
 done
 

+

 # 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


@@ -77,18 +80,19 @@ is_arch_revm() {
 }
 
 cleanup() {
 }
 
 cleanup() {

-    ./pxe-server
+    echo "doing cleanup"
+    e ./pxe-server $dhcp_arg

     ./faiserver-disable
 }
 _errcatch_cleanup=cleanup
 
 if is_arch_revm; then
     ./faiserver-disable
 }
 _errcatch_cleanup=cleanup
 
 if is_arch_revm; then

-    e ./pxe-server demohost arch
+    e ./pxe-server $dhcp_arg 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

-    e ./pxe-server demohost fai
+    e ./pxe-server $dhcp_arg demohost fai

     sleep 2
     # 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.
     sleep 2
     # 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.


@@ -116,6 +120,9 @@ if [[ $SSH_CLIENT ]]; then
     console_arg=--noautoconsole
 fi
 
     console_arg=--noautoconsole
 fi
 

+# docker makes forward default to drop, which blocks the vm pxe on flidas. easiest solution:
+s iptables -P FORWARD ACCEPT
+

 # --cpu host: this causes mkfs.btrfs to fail with a stack trace which began
 # something like:
 # init_module+0x108/0x1000 [raid6_pq]
 # --cpu host: this causes mkfs.btrfs to fail with a stack trace which began
 # something like:
 # init_module+0x108/0x1000 [raid6_pq]