From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 7 Sep 2010 23:52:39 +0000 (+0200)
Subject: main: when we encounter 'emergency' on the kernel cmdline start the emergency shell
X-Git-Tag: v10~34
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ed370f5daa27cf3c22b137b18fa9c95f1c363025;p=elogind.git

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

diff --git a/fixme b/fixme
index a58aaa89d..773b6b57f 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 d0587cb57..dc561a9b8 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);