Merge branch 'master' of git@github.com:webmin/webmin

This commit is contained in:
Jamie Cameron
2017-08-22 20:32:09 -07:00

View File

@@ -57,14 +57,14 @@ elsif ($config{'hostconfig'}) {
elsif ($config{'rc_dir'}) {
$init_mode = "rc";
}
elsif ($config{'init_base'} && -d "/etc/init" && &has_command("initctl")) {
$init_mode = "upstart";
}
elsif ($config{'init_base'} && -d "/etc/systemd" &&
&has_command("systemctl") &&
&execute_command("systemctl list-units") == 0) {
$init_mode = "systemd";
}
elsif ($config{'init_base'} && -d "/etc/init" && &has_command("initctl")) {
$init_mode = "upstart";
}
elsif ($config{'init_base'}) {
$init_mode = "init";
}