[systemd-commits] 2 commits - fixme src/service.c src/systemctl.c

[Lennart Poettering]

 fixme           |    9 +++------
 src/service.c   |    6 +++---
 src/systemctl.c |    8 ++++----
 3 files changed, 10 insertions(+), 13 deletions(-)

New commits:
commit 4694836523eb42eea731dc56413742135b6c10ba
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Aug 17 18:59:05 2010 +0200

    service: prefix descriptions when they come from legacy sources

diff --git a/src/service.c b/src/service.c
index 202557a..bc85608 100644
--- a/src/service.c
+++ b/src/service.c
@@ -488,7 +488,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                         t[k-1] = 0;
                                 }
 
-                                if (!(d = strdup(strstrip(t+12)))) {
+                                if (!(d = strappend("LSB: ", strstrip(t+12)))) {
                                         r = -ENOMEM;
                                         goto finish;
                                 }
@@ -635,7 +635,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
                                 state = LSB_DESCRIPTION;
 
-                                if (!(d = strdup(strstrip(t+12)))) {
+                                if (!(d = strappend("LSB: ", strstrip(t+12)))) {
                                         r = -ENOMEM;
                                         goto finish;
                                 }
@@ -648,7 +648,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
                                 state = LSB;
 
-                                if (!(d = strdup(strstrip(t+18)))) {
+                                if (!(d = strappend("LSB: ", strstrip(t+18)))) {
                                         r = -ENOMEM;
                                         goto finish;
                                 }
commit 85ad5b18ad226891fe2860ec7d10277ec35022e0
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Aug 17 18:53:47 2010 +0200

    systemctl: break output properly for 80ch terminals

diff --git a/fixme b/fixme
index afc8143..101cebb 100644
--- a/fixme
+++ b/fixme
@@ -14,11 +14,6 @@
   <kay>           when does it do that?
   <Viking-Ice>    if you disable the service
 
-* fixup var-run/var-lock tmpfs mounts. we need:
-    touch /var/run/utmp
-    chown root:utmp /var/run/utmp
-    mkdir -p /var/lock/subsys
-
 * have a simple syslog bridge providing /dev/log and forward messages
   to /dev/kmsg. at the moment the real syslog can be started, the bridge
   is stopped and the open /dev/log fd to the real syslog. that way we
@@ -78,7 +73,9 @@
 
 External:
 
-* nomodules nach udev umziehen
+* nologin nach /var/run https://bugzilla.redhat.com/show_bug.cgi?id=624489
+
+* make sysinit honour forcefsck/fastboot from the kernel command line
 
 * sysv functions should color when stdout is tty, not stdin
 
diff --git a/src/systemctl.c b/src/systemctl.c
index a8a5e0c..4f39cac 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -351,10 +351,10 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) {
 
         if (isatty(STDOUT_FILENO)) {
 
-                printf("\nLOAD   = Load State, reflects whether the unit configuration was properly loaded.\n"
-                       "ACTIVE = Active State, the high-level unit activation state, i.e. generalization of the substate.\n"
-                       "SUB    = Substate, the low-level unit activation state, possible values depend on unit type.\n"
-                       "JOB    = Job, shows pending jobs for the unit.\n");
+                printf("\nLOAD   = Reflects whether the unit definition was properly loaded.\n"
+                       "ACTIVE = The high-level unit activation state, i.e. generalization of SUB.\n"
+                       "SUB    = The low-level unit activation state, values depend on unit type.\n"
+                       "JOB    = Pending job for the unit.\n");
 
                 if (arg_all)
                         printf("\n%u units listed.\n", c);