Handle "not running" status
authorJamie Cameron <jcameron@webmin.com>
Thu, 30 Jul 2009 18:32:27 +0000 (11:32 -0700)
committerJamie Cameron <jcameron@webmin.com>
Thu, 30 Jul 2009 18:32:27 +0000 (11:32 -0700)
init/edit_action.cgi
init/index.cgi

index 1767c09..0b8d769 100755 (executable)
@@ -128,7 +128,10 @@ 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 =~ /running/i) {
+               if ($out =~ /not\s+running/i) {
+                       $status = "<font color=#ff0000>$text{'no'}</font>";
+                       }
+               elsif ($out =~ /running/i) {
                        $status = $text{'yes'};
                        }
                elsif ($out =~ /stopped/i) {
index 050d900..8e4dc31 100755 (executable)
@@ -157,7 +157,12 @@ elsif ($init_mode eq "init" && $access{'bootup'}) {
                                if ($actsl[$i] =~ /^0/) {
                                        local $out = $has{'status'} ?
                                                `$actsf[$i] status` : '';
-                                       if ($out =~ /running/i) {
+                                       if ($out =~ /not\s+running/i) {
+                                               push(@cols,
+                                                       "<font color=#ff0000>".
+                                                       "$text{'no'}</font>");
+                                               }
+                                       elsif ($out =~ /running/i) {
                                                push(@cols, $text{'yes'});
                                                }
                                        elsif ($out =~ /stopped/i) {