diff options
| -rw-r--r-- | lib/hydra/misc | 4 | ||||
| -rw-r--r-- | lib/hydra/provision | 2 | ||||
| -rwxr-xr-x | share/hydractl/provision | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/lib/hydra/misc b/lib/hydra/misc index 6081107..f297bdc 100644 --- a/lib/hydra/misc +++ b/lib/hydra/misc @@ -116,8 +116,8 @@ function hydra_safe_run { # Run a command using sudo and abort on error function hydra_sudo_run { - $SUDO $* - hydra_exit_on_error $* + $SUDO "$@" + hydra_exit_on_error "$@" } # Determine the next debian release diff --git a/lib/hydra/provision b/lib/hydra/provision index a2ebefe..4713564 100644 --- a/lib/hydra/provision +++ b/lib/hydra/provision @@ -2,7 +2,7 @@ # Load provision configuration function hydra_provision_config_load { - local domain="`facter domain`" + domain="`facter domain`" if [ ! -z "$1" ]; then if [ -f "$1" ]; then diff --git a/share/hydractl/provision b/share/hydractl/provision index 96784c5..5c3e574 100755 --- a/share/hydractl/provision +++ b/share/hydractl/provision @@ -544,7 +544,10 @@ if [ "$swap_size" != "0" ]; then hydra_sudo_run cryptsetup luksClose provision-swap fi -hydra_sudo_run cryptsetup luksClose provision-root +if [ "$encrypt" == "y" ]; then + hydra_sudo_run cryptsetup luksClose provision-root +fi + hydra_sudo_run vgchange -a n $vg cat <<-EOF |