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

[Lennart Poettering]

 TODO                      |   13 +++++++++++++
 src/firstboot/firstboot.c |    3 ---
 src/journal/journalctl.c  |   16 +++++++++++-----
 3 files changed, 24 insertions(+), 8 deletions(-)

New commits:
commit 07a60cc13c48c5f79616b07aad2808bfe809de22
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Oct 22 20:29:25 2014 +0200

    firstboot: don't prohibit re-generating the machine id on the current root fs
    
    If it really is missing it should be safe to create it.
    
    Also see:
    
    http://lists.freedesktop.org/archives/systemd-devel/2014-August/022726.html

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 6b0d2fc..93273d9 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -451,9 +451,6 @@ static int process_machine_id(void) {
         if (faccessat(AT_FDCWD, etc_machine_id, F_OK, AT_SYMLINK_NOFOLLOW) >= 0)
                 return 0;
 
-        if (!arg_root)
-                return 0;
-
         if (sd_id128_equal(arg_machine_id, SD_ID128_NULL))
                 return 0;
 

commit 8483d73ff158ee0d51ccbba09a470cc6ae9b071a
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Oct 22 20:24:16 2014 +0200

    update TODO

diff --git a/TODO b/TODO
index f45b02c..c38ad91 100644
--- a/TODO
+++ b/TODO
@@ -41,6 +41,19 @@ External:
 
 Features:
 
+* configure.ac pretends dbus was optional but actually hardcodes use of dbus' pkg-config file to determine various dbus dirs such as policy and activation dirs
+
+* consider showing the unit names during boot up in the status output, not just the unit descriptions
+
+* send SIGABRT when a service watchdog is triggered, by default, so that we acquire a backtrace of the hang.
+
+* shouldn't RouteMetric= in networkd's [DHCP] section move to [Network]?
+
+* dhcp: do we allow configuring dhcp routes on interfaces that are not the one we got the dhcp info from?
+
+* maybe allow timer units with an empty Units= setting, so that they
+  can be used for resuming the system but nothing else.
+
 * what to do about udev db binary stability for apps?
 
 * add a system-wide shutdown timeout, similar to the startup timeout we already have (see fdo bz #84110)

commit 97e1cc8b591ee508382863ae805ed89c00775cf3
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Oct 22 20:23:45 2014 +0200

    journalctl: don't introduce numeric constants with special names, give them names

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 328e40b..ee4e165 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -62,6 +62,12 @@
 
 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
 
+enum {
+        /* Special values for arg_lines */
+        ARG_LINES_DEFAULT = -2,
+        ARG_LINES_ALL = -1,
+};
+
 static OutputMode arg_output = OUTPUT_SHORT;
 static bool arg_utc = false;
 static bool arg_pager_end = false;
@@ -69,7 +75,7 @@ static bool arg_follow = false;
 static bool arg_full = true;
 static bool arg_all = false;
 static bool arg_no_pager = false;
-static int arg_lines = -2;
+static int arg_lines = ARG_LINES_DEFAULT;
 static bool arg_no_tail = false;
 static bool arg_quiet = false;
 static bool arg_merge = false;
@@ -339,7 +345,7 @@ static int parse_argv(int argc, char *argv[]) {
                 case 'e':
                         arg_pager_end = true;
 
-                        if (arg_lines < -1)
+                        if (arg_lines == ARG_LINES_DEFAULT)
                                 arg_lines = 1000;
 
                         break;
@@ -379,7 +385,7 @@ static int parse_argv(int argc, char *argv[]) {
                 case 'n':
                         if (optarg) {
                                 if (streq(optarg, "all"))
-                                        arg_lines = -1;
+                                        arg_lines = ARG_LINES_ALL;
                                 else {
                                         r = safe_atoi(optarg, &arg_lines);
                                         if (r < 0 || arg_lines < 0) {
@@ -398,7 +404,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 if (optind < argc) {
                                         int n;
                                         if (streq(argv[optind], "all")) {
-                                                arg_lines = -1;
+                                                arg_lines = ARG_LINES_ALL;
                                                 optind++;
                                         } else if (safe_atoi(argv[optind], &n) >= 0 && n >= 0) {
                                                 arg_lines = n;
@@ -662,7 +668,7 @@ static int parse_argv(int argc, char *argv[]) {
                         assert_not_reached("Unhandled option");
                 }
 
-        if (arg_follow && !arg_no_tail && arg_lines < -1)
+        if (arg_follow && !arg_no_tail && arg_lines == ARG_LINES_DEFAULT)
                 arg_lines = 10;
 
         if (!!arg_directory + !!arg_file + !!arg_machine > 1) {