Blame 0163-Revert-rename-kernel-command-line-param-action_on_fa.patch

Harald Hoyer bb31e7
From 927d1e28c9ad63794df6c1a21c2e7b7bca8d86ce Mon Sep 17 00:00:00 2001
Harald Hoyer bb31e7
From: "dyoung@redhat.com" <dyoung@redhat.com>
Harald Hoyer bb31e7
Date: Mon, 31 Aug 2015 10:43:16 +0800
Harald Hoyer bb31e7
Subject: [PATCH] Revert "rename kernel command line param action_on_fail to
Harald Hoyer bb31e7
 rd.action_on_fail"
Harald Hoyer bb31e7
Harald Hoyer bb31e7
This reverts commit 391d6057908be2fe78f8084eb1b2adc27c781c0b.
Harald Hoyer bb31e7
Harald Hoyer bb31e7
action_on_fail is useless thus remove the commits for it one by one.
Harald Hoyer bb31e7
Harald Hoyer bb31e7
Signed-off-by: Dave Young <dyoung@redhat.com>
Harald Hoyer bb31e7
---
Harald Hoyer bb31e7
 dracut.cmdline.7.asc           | 2 +-
Harald Hoyer bb31e7
 modules.d/99base/dracut-lib.sh | 2 +-
Harald Hoyer bb31e7
 2 files changed, 2 insertions(+), 2 deletions(-)
Harald Hoyer bb31e7
Harald Hoyer bb31e7
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
Harald Hoyer bb31e7
index ad99799..cd8cc66 100644
Harald Hoyer bb31e7
--- a/dracut.cmdline.7.asc
Harald Hoyer bb31e7
+++ b/dracut.cmdline.7.asc
Harald Hoyer bb31e7
@@ -159,7 +159,7 @@ Misc
Harald Hoyer bb31e7
    specify the controlling terminal for the console.
Harald Hoyer bb31e7
    This is useful, if you have multiple "console=" arguments.
Harald Hoyer bb31e7
 
Harald Hoyer bb31e7
-**rd.action_on_fail=**_{shell|continue}_::
Harald Hoyer bb31e7
+**action_on_fail=**_{shell|continue}_::
Harald Hoyer bb31e7
    Specify the action after failure. By default it's emergency_shell.
Harald Hoyer bb31e7
    'continue' means: ignore the current failure and go ahead.
Harald Hoyer bb31e7
 
Harald Hoyer bb31e7
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
Harald Hoyer bb31e7
index cc5bb42..1ac9b3c 100755
Harald Hoyer bb31e7
--- a/modules.d/99base/dracut-lib.sh
Harald Hoyer bb31e7
+++ b/modules.d/99base/dracut-lib.sh
Harald Hoyer bb31e7
@@ -1143,7 +1143,7 @@ emergency_shell()
Harald Hoyer bb31e7
 
Harald Hoyer bb31e7
 action_on_fail()
Harald Hoyer bb31e7
 {
Harald Hoyer bb31e7
-    local _action=$(getarg rd.action_on_fail= -d action_on_fail=)
Harald Hoyer bb31e7
+    local _action=$(getarg action_on_fail=)
Harald Hoyer bb31e7
     case "$_action" in
Harald Hoyer bb31e7
         continue)
Harald Hoyer bb31e7
             [ "$1" = "-n" ] && shift 2