summaryrefslogtreecommitdiff
path: root/share/hydractl
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-01-05 14:27:37 -0200
committerSilvio Rhatto <rhatto@riseup.net>2014-01-05 14:27:37 -0200
commite0a6b07725866c5c9565b782050f15b9e4d8d68a (patch)
tree3965d354b68b29a41bc8c29f419b681da255bac6 /share/hydractl
parent1ca957ff6f243a319344b7d607d7184f667a0951 (diff)
downloadhydra-e0a6b07725866c5c9565b782050f15b9e4d8d68a.tar.gz
hydra-e0a6b07725866c5c9565b782050f15b9e4d8d68a.tar.bz2
Fix environment settings on system-upgrade
Diffstat (limited to 'share/hydractl')
-rwxr-xr-xshare/hydractl/system-upgrade4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index 6132e98..51df318 100755
--- 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