diff options
author | Simon Rettberg | 2015-09-29 15:22:07 +0200 |
---|---|---|
committer | Simon Rettberg | 2015-09-29 15:22:07 +0200 |
commit | 9d0f2ffbd0700e7ad31e41657794592feef83500 (patch) | |
tree | 3b18f7b4ed3a0d05e96a6f946985a1d2f5654c6e /inc/trigger.inc.php | |
parent | [baseconfig] Mask root password if applicable (diff) | |
download | slx-admin-9d0f2ffbd0700e7ad31e41657794592feef83500.tar.gz slx-admin-9d0f2ffbd0700e7ad31e41657794592feef83500.tar.xz slx-admin-9d0f2ffbd0700e7ad31e41657794592feef83500.zip |
[vmstore] Only save config if mounting succeeded
Diffstat (limited to 'inc/trigger.inc.php')
-rw-r--r-- | inc/trigger.inc.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php index ace55bf6..fcd1b3c0 100644 --- a/inc/trigger.inc.php +++ b/inc/trigger.inc.php @@ -112,11 +112,14 @@ class Trigger /** * Mount the VM store into the server. * + * @param array $vmstore VM Store configuration to use. If false, read from properties * @return array task status of mount procedure, or false on error */ - public static function mount() + public static function mount($vmstore = false) { - $vmstore = Property::getVmStoreConfig(); + if ($vmstore === false) { + $vmstore = Property::getVmStoreConfig(); + } if (!is_array($vmstore)) return false; if (isset($vmstore['storetype'])) { |