Handle status of 'no server running'
authorJamie Cameron <jcameron@webmin.com>
Wed, 6 Apr 2011 19:58:01 +0000 (12:58 -0700)
committerJamie Cameron <jcameron@webmin.com>
Wed, 6 Apr 2011 19:58:01 +0000 (12:58 -0700)
init/edit_action.cgi
init/index.cgi

index a5bdef2..dcccf75 100755 (executable)
@@ -128,7 +128,8 @@ elsif (!$config{'expert'} || $access{'bootup'} == 2) {
        # Show if action is currently running
        if ($hasarg{'status'} && $config{'status_check'}) {
                $out = &backquote_command("$file status</dev/null 2>/dev/null");
-               if ($out =~ /not\s+running/i) {
+               if ($out =~ /not\s+running/i ||
+                   $out =~ /no\s+server\s+running/i) {
                        $status = "<font color=#ff0000>$text{'no'}</font>";
                        }
                elsif ($out =~ /running/i) {
index 8e4dc31..212ec79 100755 (executable)
@@ -157,7 +157,8 @@ elsif ($init_mode eq "init" && $access{'bootup'}) {
                                if ($actsl[$i] =~ /^0/) {
                                        local $out = $has{'status'} ?
                                                `$actsf[$i] status` : '';
-                                       if ($out =~ /not\s+running/i) {
+                                       if ($out =~ /not\s+running/i ||
+                                           $out =~ /no\s+server\s+running/i) {
                                                push(@cols,
                                                        "<font color=#ff0000>".
                                                        "$text{'no'}</font>");