[systemd-commits] 2 commits - fixme src/main.c src/sd-daemon.h

[Lennart Poettering]

 fixme           |    4 ++++
 src/main.c      |   19 ++++++++++---------
 src/sd-daemon.h |    2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit da5fcb10605026d1baa09f6da9b516a5641faa9c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Sep 8 01:55:17 2010 +0200

    sd-daemon: optionally, avoid hiding the ELF symbols

diff --git a/src/sd-daemon.h b/src/sd-daemon.h
index 3474213..6c8872f 100644
--- a/src/sd-daemon.h
+++ b/src/sd-daemon.h
@@ -67,7 +67,7 @@ extern "C" {
   See sd-daemon(7) for more information.
 */
 
-#if __GNUC__ >= 4
+#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS)
 #define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
 #define _sd_hidden_ __attribute__ ((visibility("hidden")))
 #else
commit ed370f5daa27cf3c22b137b18fa9c95f1c363025
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Sep 8 01:52:39 2010 +0200

    main: when we encounter 'emergency' on the kernel cmdline start the emergency shell

diff --git a/fixme b/fixme
index a58aaa8..773b6b5 100644
--- a/fixme
+++ b/fixme
@@ -74,6 +74,10 @@
 
 * kexec, suspend, resume
 
+* passphrase agent https://bugs.freedesktop.org/show_bug.cgi?id=30038
+
+* emergency.service should start default.target after C-d.
+
 External:
 
 * place /etc/inittab with explaining blurb.
diff --git a/src/main.c b/src/main.c
index d0587cb..dc561a9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -234,15 +234,16 @@ static int set_default_unit(const char *u) {
 static int parse_proc_cmdline_word(const char *word) {
 
         static const char * const rlmap[] = {
-                "single", SPECIAL_RESCUE_TARGET,
-                "-s",     SPECIAL_RESCUE_TARGET,
-                "s",      SPECIAL_RESCUE_TARGET,
-                "S",      SPECIAL_RESCUE_TARGET,
-                "1",      SPECIAL_RESCUE_TARGET,
-                "2",      SPECIAL_RUNLEVEL2_TARGET,
-                "3",      SPECIAL_RUNLEVEL3_TARGET,
-                "4",      SPECIAL_RUNLEVEL4_TARGET,
-                "5",      SPECIAL_RUNLEVEL5_TARGET
+                "emergency", SPECIAL_EMERGENCY_TARGET,
+                "single",    SPECIAL_RESCUE_TARGET,
+                "-s",        SPECIAL_RESCUE_TARGET,
+                "s",         SPECIAL_RESCUE_TARGET,
+                "S",         SPECIAL_RESCUE_TARGET,
+                "1",         SPECIAL_RESCUE_TARGET,
+                "2",         SPECIAL_RUNLEVEL2_TARGET,
+                "3",         SPECIAL_RUNLEVEL3_TARGET,
+                "4",         SPECIAL_RUNLEVEL4_TARGET,
+                "5",         SPECIAL_RUNLEVEL5_TARGET,
         };
 
         assert(word);