From 7fd42f1c3e9a33ddb6ec0504894bea4a488d233f Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Sun, 24 Jan 2021 13:51:56 +0300 Subject: [PATCH] Add better logic to test unit status https://github.com/webmin/webmin/commit/23adcc8bc0b6b7d64616f6a95a327676fd3c33ab --- init/init-lib.pl | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/init/init-lib.pl b/init/init-lib.pl index b7c3286dc..d09048e51 100755 --- a/init/init-lib.pl +++ b/init/init-lib.pl @@ -549,13 +549,9 @@ elsif ($init_mode eq "systemd") { else { my $out = &backquote_command("systemctl is-enabled ". quotemeta($unit)." 2>&1"); - if (lc($out) =~ /no such file/) { - return 0; - } - else { - $out =~ s/^\s+|\s+$//g; - return $out eq 'enabled' ? 2 : 1; - } + $out =~ s/^\s+|\s+$//g; + return lc($out) eq 'enabled' ? 2 : + (lc($out) eq 'disabled' ? 1 : 0); } } if ($init_mode eq "init" || $init_mode eq "upstart" ||