aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-01-06 22:35:01 -0200
committerSilvio Rhatto <rhatto@riseup.net>2016-01-06 22:35:01 -0200
commit8f867e614f78adc21a773aae9961c457f1a302d0 (patch)
tree1fc996a5f0efd75e82712d7f132ccf5073a46bde
parent731b0280b830c46b7b9fd7ee5cea0fed106cdb8c (diff)
downloadhydra-8f867e614f78adc21a773aae9961c457f1a302d0.tar.gz
hydra-8f867e614f78adc21a773aae9961c457f1a302d0.tar.bz2
Fix initial states on system-upgrade
-rwxr-xr-xshare/hydractl/system-upgrade11
1 files changed, 4 insertions, 7 deletions
diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index 84aec30..ec3c5c3 100755
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -38,9 +38,6 @@ function hydra_system_upgrade_stage {
# Set and check upgrade environment
function hydra_system_upgrade_env {
- # Set initial state
- hydra_system_upgrade_stage env
-
# Available releases
#release="`facter lsbdistcodename`" # this doesn't work on squeeze
release="`facter 2> /dev/null | grep lsbdistcodename | sed -e 's/lsbdistcodename => //'`"
@@ -74,7 +71,7 @@ function hydra_system_upgrade_env {
fi
fi
- # Set next state
+ # Set next state
hydra_system_upgrade_stage prepare
}
@@ -101,7 +98,7 @@ function hydra_system_upgrade_prepare {
apt-get remove colord -y
fi
- # Set next state
+ # Set next state
hydra_system_upgrade_stage download
}
@@ -163,7 +160,7 @@ function hydra_system_upgrade_puppet {
# Initialize
if [ ! -e "$STATE" ]; then
- hydra_system_upgrade_env
+ hydra_system_upgrade_stage env
else
# Resume from the previous state
STAGE="`cat $STATE`"
@@ -174,7 +171,7 @@ else
fi
if [ ! -z "$STAGE" ]; then
- hydra_system_upgrade_$STAGE
+ hydra_system_upgrade_stage $STAGE
fi
fi