From ed370f5daa27cf3c22b137b18fa9c95f1c363025 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 8 Sep 2010 01:52:39 +0200 Subject: main: when we encounter 'emergency' on the kernel cmdline start the emergency shell --- fixme | 4 ++++ src/main.c | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/fixme b/fixme index a58aaa89d2..773b6b57f2 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 d0587cb57b..dc561a9b80 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); -- cgit v1.2.3-54-g00ecf