[systemd-commits] 2 commits - man/os-release.xml src/systemctl.c TODO

[Lennart Poettering]

 TODO               |   10 ++++++++--
 man/os-release.xml |    8 +++++++-
 src/systemctl.c    |    9 +++++----
 3 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit 6bd212771129d00cf7b42d6774a6b81547569384
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Nov 22 00:26:08 2010 +0100

    man: make clear that VERSION and VERSION_ID is not mandatory in os-release.5

diff --git a/TODO b/TODO
index 1069896..fbe299c 100644
--- a/TODO
+++ b/TODO
@@ -75,6 +75,8 @@ Fedora:
 
 * chkconfig → systemd enable/daemon-reload glue
 
+* /var/lock, /var/run → what happens if rpm stuff is no %ghosted?
+
 External:
 
 * make cryptsetup lower --iter-time
diff --git a/man/os-release.xml b/man/os-release.xml
index c6eb28f..b5f42b2 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -167,9 +167,15 @@
 
                 <para>If you interpreting this file from code or a
                 shell script, use the ID and VERSION_ID fields. When
-                looking for an OS indetification string for
+                looking for an OS identification string for
                 presentation to the user use the PRETTY_STRING
                 field.</para>
+
+                <para>Note that operating system vendors may choose
+                not to provide version information, for example to
+                accomodate for rolling releases. In this case VERSION
+                and VERSION_ID may be unset. Applications should not
+                rely on these fields to be set.</para>
         </refsect1>
 
         <refsect1>

commit be8088a2fb41467f66978f86b11bf47c546f24ed
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sun Nov 21 22:40:03 2010 +0100

    systemctl: don't return LSB status error codes for systemctl show
    
    Use them only for systemctl status.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=637183

diff --git a/TODO b/TODO
index 12e292e..1069896 100644
--- a/TODO
+++ b/TODO
@@ -28,8 +28,6 @@
 
 * set_put(), hashmap_put() return values check. i.e. == 0 doesn't free()!
 
-* chkconfig/systemd enable glue
-
 * io priority during initialization
 
 * if a service fails too often, make the service enter failed mode, and the socket, too.
@@ -71,6 +69,12 @@
 
 * isolate multi-user.target doesn't start a getty at tty1 if we run it from graphical.target
 
+Fedora:
+
+* obsolete readhead in system pkgs
+
+* chkconfig → systemd enable/daemon-reload glue
+
 External:
 
 * make cryptsetup lower --iter-time
diff --git a/src/systemctl.c b/src/systemctl.c
index 0948e61..4768fb2 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -2338,7 +2338,7 @@ static int print_property(const char *name, DBusMessageIter *iter) {
         return 0;
 }
 
-static int show_one(DBusConnection *bus, const char *path, bool show_properties, bool *new_line) {
+static int show_one(const char *verb, DBusConnection *bus, const char *path, bool show_properties, bool *new_line) {
         DBusMessage *m = NULL, *reply = NULL;
         const char *interface = "";
         int r;
@@ -2438,7 +2438,8 @@ static int show_one(DBusConnection *bus, const char *path, bool show_properties,
                 print_status_info(&info);
 
         if (!streq_ptr(info.active_state, "active") &&
-            !streq_ptr(info.active_state, "reloading"))
+            !streq_ptr(info.active_state, "reloading") &&
+            streq(verb, "status"))
                 /* According to LSB: "program not running" */
                 r = 3;
 
@@ -2477,7 +2478,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
                 /* If not argument is specified inspect the manager
                  * itself */
 
-                ret = show_one(bus, "/org/freedesktop/systemd1", show_properties, &new_line);
+                ret = show_one(args[0], bus, "/org/freedesktop/systemd1", show_properties, &new_line);
                 goto finish;
         }
 
@@ -2611,7 +2612,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
                         goto finish;
                 }
 
-                if ((r = show_one(bus, path, show_properties, &new_line)) != 0)
+                if ((r = show_one(args[0], bus, path, show_properties, &new_line)) != 0)
                         ret = r;
 
                 dbus_message_unref(m);