From 8f867e614f78adc21a773aae9961c457f1a302d0 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 6 Jan 2016 22:35:01 -0200 Subject: Fix initial states on system-upgrade --- share/hydractl/system-upgrade | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'share/hydractl/system-upgrade') 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 -- cgit v1.2.3