Tell boot systems like systemd that webmin's start script forks into the background

This commit is contained in:
Jamie Cameron
2015-05-19 21:57:20 -07:00
parent 57efdd9a28
commit 8227e56084
2 changed files with 18 additions and 2 deletions
+9 -1
View File
@@ -6,6 +6,8 @@ require './usermin-lib.pl';
$access{'bootup'} || &error($text{'bootup_ecannot'});
&foreign_require("init");
&ReadParse();
my %miniserv;
&get_usermin_miniserv_config(\%miniserv);
if ($in{'boot'}) {
# Enable starting at boot
@@ -13,6 +15,10 @@ if ($in{'boot'}) {
if ($init::init_mode eq "launchd") {
# Launchd forks automatically
$start .= " --nofork";
$fork = 0;
}
else {
$fork = 1;
}
$stop = "$config{'usermin_dir'}/stop";
$status = <<EOF;
@@ -33,7 +39,9 @@ else
fi
EOF
&init::enable_at_boot("usermin", "Start or stop Usermin",
$start, $stop, $status);
$start, $stop, $status,
{ 'fork' => $fork,
'pidfile' => $miniserv{'pidfile'} });
}
else {
# Disable starting at boot
+9 -1
View File
@@ -5,6 +5,8 @@
require './webmin-lib.pl';
&foreign_require("init");
&ReadParse();
my %miniserv;
&get_miniserv_config(\%miniserv);
if ($in{'boot'}) {
# Enable starting at boot
@@ -12,6 +14,10 @@ if ($in{'boot'}) {
if ($init::init_mode eq "launchd") {
# Launchd forks automatically
$start .= " --nofork";
$fork = 0;
}
else {
$fork = 1;
}
$stop = "$config_directory/stop";
$status = <<EOF;
@@ -32,7 +38,9 @@ else
fi
EOF
&init::enable_at_boot("webmin", "Start or stop Webmin",
$start, $stop, $status);
$start, $stop, $status,
{ 'fork' => $fork,
'pidfile' => $miniserv{'pidfile'} });
}
else {
# Disable starting at boot