Fix environment settings on system-upgrade

diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index 6132e982ccdb1c2765938862b9a42548dd70e0a1..51df31835d4c10665f44715bbe29633289189ce6 100755 (executable)
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -46,7 +46,7 @@ function hydra_system_upgrade_env {
   nextrelease="`hydra_next_debian_release $release`"
 
   # Is a virtual machine?
-  virtual="`facter 2> /dev/null | grep virtual | sed -e 's/virtual => //'`"
+  virtual="`facter 2> /dev/null | grep virtual | grep -v '^is_virtual' | sed -e 's/virtual => //'`"
 
   # Save environment
   echo "release=$release"          > $ENV
@@ -125,7 +125,7 @@ else
   # Restore environment
   if [ -e "$ENV" ]; then
     source $ENV
-    hydra_system_upgrade_$STATE
+    hydra_system_upgrade_$STAGE
   fi
 fi