From: dyoung@redhat.com Date: Mon, 31 Aug 2015 02:43:16 +0000 (+0800) Subject: Revert "rename kernel command line param action_on_fail to rd.action_on_fail" X-Git-Tag: 044~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=927d1e28c9ad63794df6c1a21c2e7b7bca8d86ce;p=thirdparty%2Fdracut.git Revert "rename kernel command line param action_on_fail to rd.action_on_fail" This reverts commit 391d6057908be2fe78f8084eb1b2adc27c781c0b. action_on_fail is useless thus remove the commits for it one by one. Signed-off-by: Dave Young --- diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc index ad9979901..cd8cc66ad 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -159,7 +159,7 @@ Misc specify the controlling terminal for the console. This is useful, if you have multiple "console=" arguments. -**rd.action_on_fail=**_{shell|continue}_:: +**action_on_fail=**_{shell|continue}_:: Specify the action after failure. By default it's emergency_shell. 'continue' means: ignore the current failure and go ahead. diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh index cc5bb4261..1ac9b3cef 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -1143,7 +1143,7 @@ emergency_shell() action_on_fail() { - local _action=$(getarg rd.action_on_fail= -d action_on_fail=) + local _action=$(getarg action_on_fail=) case "$_action" in continue) [ "$1" = "-n" ] && shift 2