systemctl: break output properly for 80ch terminals

diff --git a/fixme b/fixme
index afc8143b754a6fe21bcb082822da5bff94d05b36..101cebb2ccf7656e0f92123bf3133b112fc44223 100644 (file)
--- a/fixme
+++ b/fixme
@@ -14,11 +14,6 @@
   <kay>           when does it do that?
   <Viking-Ice>    if you disable the service
 
   <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
 * 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:
 
 
 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
 
 
 * sysv functions should color when stdout is tty, not stdin
 

diff --git a/src/systemctl.c b/src/systemctl.c
index a8a5e0c20745eefffb00c27629fa406860a4ef79..4f39cac07b8a20f08030ae7d4b0088b84e3affa4 100644 (file)
--- 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)) {
 
 
         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);
 
                 if (arg_all)
                         printf("\n%u units listed.\n", c);