summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules-available/dnbd3/inc/dnbd3.inc.php6
-rw-r--r--modules-available/dnbd3/page.inc.php3
-rw-r--r--modules-available/systemstatus/page.inc.php2
3 files changed, 3 insertions, 8 deletions
diff --git a/modules-available/dnbd3/inc/dnbd3.inc.php b/modules-available/dnbd3/inc/dnbd3.inc.php
index 9607c544..82946aaa 100644
--- a/modules-available/dnbd3/inc/dnbd3.inc.php
+++ b/modules-available/dnbd3/inc/dnbd3.inc.php
@@ -13,10 +13,6 @@ class Dnbd3 {
public static function setEnabled($bool)
{
Property::set(self::PROP_ENABLED, $bool ? 1 : 0);
- $task = Taskmanager::submit('Systemctl', array(
- 'operation' => ($bool ? 'start' : 'stop'),
- 'service' => 'dnbd3-server'
- ));
return $task;
}
@@ -35,4 +31,4 @@ class Dnbd3 {
}
-} \ No newline at end of file
+}
diff --git a/modules-available/dnbd3/page.inc.php b/modules-available/dnbd3/page.inc.php
index 87169a03..1f5b8c91 100644
--- a/modules-available/dnbd3/page.inc.php
+++ b/modules-available/dnbd3/page.inc.php
@@ -75,9 +75,8 @@ class Page_Dnbd3 extends Page
User::assertPermission('toggle-usage');
$enabled = Request::post('enabled', false, 'bool');
$nfs = Request::post('with-nfs', false, 'bool');
- $task = Dnbd3::setEnabled($enabled);
+ Dnbd3::setEnabled($enabled);
Dnbd3::setNfsFallback($nfs);
- Taskmanager::waitComplete($task, 5000);
}
private function saveServerLocations()
diff --git a/modules-available/systemstatus/page.inc.php b/modules-available/systemstatus/page.inc.php
index 04423eaf..74ed3f47 100644
--- a/modules-available/systemstatus/page.inc.php
+++ b/modules-available/systemstatus/page.inc.php
@@ -242,7 +242,7 @@ class Page_SystemStatus extends Page
$tasks = array();
$todo = ['dmsd', 'tftpd-hpa'];
- if (Module::isAvailable('dnbd3') && Dnbd3::isEnabled()) {
+ if (Module::get('dnbd3') !== false) {
$todo[] = 'dnbd3-server';
}