limit fai nfs export to host being installed

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index cc494cccb2c424293cf95ca05383b4c9dd44a3a7..8d782c0f857f6fbc48bf0231d2046de632e9e660 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.
 


@@ -43,15 +43,13 @@ EOF
     exit $1
 }
 
     exit $1
 }
 

-

 new_disk=false
 new_disk=false

-reboot=true

 temp=$(getopt -l help hnr "$@") || usage 1
 eval set -- "$temp"
 while true; do
     case $1 in
         -n) new_disk=true; shift ;;
 temp=$(getopt -l help hnr "$@") || usage 1
 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 ;;


@@ -120,7 +118,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


@@ -128,9 +126,8 @@ if [[ $SSH_CLIENT ]]; then
 fi
 
 sleep 30
 fi
 
 sleep 30

-while ! timeout -s 9 10 ssh root@$name /bin/true; do
+while ! timeout -s 9 10 ssh -oBatchMode=yes root@$name /bin/true; do

     e sleep 5
     e sleep 5

-    khfix root@$name ||:

 done
 cleanup() { :; }
 e pxe-server
 done
 cleanup() { :; }
 e pxe-server