[systemd-commits] 3 commits - TODO src/journal src/login

[Lennart Poettering]

 TODO                   |    2 ++
 src/journal/coredump.c |    2 +-
 src/login/inhibit.c    |   27 +++++++++------------------
 3 files changed, 12 insertions(+), 19 deletions(-)

New commits:
commit 9058482225a046dc66406ba4cf4250612eca3794
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Mar 1 19:21:47 2013 +0100

    update TODO

diff --git a/TODO b/TODO
index 168913b..17b5081 100644
--- a/TODO
+++ b/TODO
@@ -49,6 +49,8 @@ Fedora 19:
 
 Features:
 
+* remove "rootwait" support from fstab generator
+
 * rework specifier logic so that we can distuingish OOM errors from other errors
 
 * systemd-inhibit: refuse taking delay locks

commit 41330ddb033f2cbeeb565e43708be91d5df28fb2
Author: Mantas MikulÄ—nas <grawity at gmail.com>
Date:   Sun Feb 17 21:00:34 2013 +0200

    inhibit: make the output more readable
    
    The columnar output can become pretty horrible. When GNOME inhibits
    power/suspend/hibernate keys, the "WHAT" column's text extends to "WHO"
    and even "WHY". At the same time, all texts in "WHY" are of the form
    
        GNOME handlin...sses
        Receiving sle...ions
        GNOME needs t...reen
    
    This patch splits each inhibit entry into four lines, allowing the full
    text to fit in a normal-width terminal.

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 9b66133..5865821 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -99,18 +99,9 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                 goto finish;
         }
 
-        printf("%-21s %-20s %-20s %-5s %6s %6s\n",
-               "WHAT",
-               "WHO",
-               "WHY",
-               "MODE",
-               "UID",
-               "PID");
-
         dbus_message_iter_recurse(&iter, &sub);
         while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
                 const char *what, *who, *why, *mode;
-                char *ewho, *ewhy;
                 dbus_uint32_t uid, pid;
 
                 if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) {
@@ -130,21 +121,21 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                         goto finish;
                 }
 
-                ewho = ellipsize(who, 20, 66);
-                ewhy = ellipsize(why, 20, 66);
-
-                printf("%-21s %-20s %-20s %-5s %6lu %6lu\n",
-                       what, ewho ? ewho : who, ewhy ? ewhy : why, mode, (unsigned long) uid, (unsigned long) pid);
-
-                free(ewho);
-                free(ewhy);
+                printf("     Who: %s (UID %lu, PID %lu)\n"
+                       "    What: %s\n"
+                       "     Why: %s\n"
+                       "    Mode: %s\n\n",
+                       who, (unsigned long) uid, (unsigned long) pid,
+                       what,
+                       why,
+                       mode);
 
                 dbus_message_iter_next(&sub);
 
                 n++;
         }
 
-        printf("\n%u inhibitors listed.\n", n);
+        printf("%u inhibitors listed.\n", n);
         r = 0;
 
 finish:

commit 41be2ca14d34b67776240bc67facf341b156b974
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Mar 1 15:19:00 2013 +0100

    coredump: bump coredump truncation size from 24M to 768M
    
    In the long run we really should make this runtime configurable.

diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index 021b4c6..bada848 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -37,7 +37,7 @@
 #include "special.h"
 #include "cgroup-util.h"
 
-#define COREDUMP_MAX (24*1024*1024)
+#define COREDUMP_MAX (768*1024*1024)
 
 enum {
         ARG_PID = 1,