summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-05-16 02:37:59 +0200
committerLennart Poettering <lennart@poettering.net>2010-05-16 02:37:59 +0200
commita1d821025a51e119a5959fb8b3fb976e41260f1a (patch)
tree1647b14c1a3939a537c3f1060209f83e86e5b2b3
parent129126f3792c452c871c0a096dcb1020c4d8096b (diff)
systemadm: consider units with a job live
-rw-r--r--99-systemd.rules2
-rw-r--r--systemadm.vala6
2 files changed, 4 insertions, 4 deletions
diff --git a/99-systemd.rules b/99-systemd.rules
index c5c330f936..e88f10a6ed 100644
--- a/99-systemd.rules
+++ b/99-systemd.rules
@@ -22,7 +22,7 @@ KERNEL=="ttyS*", ENV{SYSTEMD_EXPOSE}="1"
SUBSYSTEM=="block", ENV{SYSTEMD_EXPOSE}="1"
-# We need a hardware independant way to identify network devices. We
+# We need a hardware independent way to identify network devices. We
# use the /sys/subsystem path for this. Current vanilla kernels don't
# actually support that hierarchy right now, however upcoming kernels
# will. HAL and udev internally support /sys/subsystem already, hence
diff --git a/systemadm.vala b/systemadm.vala
index d4b760ad1f..92ee503b11 100644
--- a/systemadm.vala
+++ b/systemadm.vala
@@ -633,9 +633,9 @@ public class MainWindow : Window {
}
public bool unit_filter(TreeModel model, TreeIter iter) {
- string id, active_state;
+ string id, active_state, job;
- model.get(iter, 0, out id, 3, out active_state);
+ model.get(iter, 0, out id, 3, out active_state, 5, out job);
if (id == null)
return false;
@@ -646,7 +646,7 @@ public class MainWindow : Window {
return true;
case 1:
- return active_state != "inactive";
+ return active_state != "inactive" || job != "";
case 2:
return id.has_suffix(".service");