public inbox for initramfs@vger.kernel.org
 help / color / mirror / Atom feed
From: dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
To: initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
	bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
	harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Subject: [patch 5/6] [PATCH 5/5] Revert "99fs-lib/fs-lib.sh: Let user specify the action after fail for fsck"
Date: Mon, 31 Aug 2015 10:43:19 +0800	[thread overview]
Message-ID: <20150831024414.030029156@redhat.com> (raw)
In-Reply-To: 20150831024314.798498962@redhat.com

[-- Attachment #1: 0005-Revert-99fs-lib-fs-lib.sh-Let-user-specify-the-actio.patch --]
[-- Type: text/plain, Size: 1098 bytes --]

This reverts commit 679fa7ed3c0f4c827bfc6885d34f56713fe85c1e.

action_on_fail is useless thus remove the commits for it one by one.

Signed-off-by: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 modules.d/99fs-lib/fs-lib.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
index df3803d..672d027 100755
--- a/modules.d/99fs-lib/fs-lib.sh
+++ b/modules.d/99fs-lib/fs-lib.sh
@@ -5,14 +5,14 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 fsck_ask_reboot() {
     info "note - fsck suggests reboot, if you"
     info "leave shell, booting will continue normally"
-    action_on_fail -n "(reboot ?)"
+    emergency_shell -n "(reboot ?)"
 }
 
 fsck_ask_err() {
     warn "*** An error occurred during the file system check."
     warn "*** Dropping you to a shell; the system will try"
     warn "*** to mount the filesystem(s), when you leave the shell."
-    action_on_fail -n "(Repair filesystem)"
+    emergency_shell -n "(Repair filesystem)"
 }
 
 # inherits: _ret _drv _out
-- 
1.8.3.1



  parent reply	other threads:[~2015-08-31  2:43 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-31  2:43 [patch 0/6] Revert action_on_fail patches dyoung-H+wXaHxf7aLQT0dZR+AlfA
2015-08-31  2:43 ` [patch 1/6] [PATCH 1/5] Revert "Change the implementation of action_on_fail" dyoung-H+wXaHxf7aLQT0dZR+AlfA
2015-08-31  2:43 ` [patch 2/6] [PATCH 2/5] Revert "rename kernel command line param action_on_fail to rd.action_on_fail" dyoung-H+wXaHxf7aLQT0dZR+AlfA
2015-08-31  2:43 ` [patch 3/6] [PATCH 3/5] Revert "systemd/emergency.service: do not run for action_on_fail=continue" dyoung-H+wXaHxf7aLQT0dZR+AlfA
2015-08-31  2:43 ` [patch 4/6] [PATCH 4/5] Revert "dracut-emergency.service: do not start for "action_on_fail=continue"" dyoung-H+wXaHxf7aLQT0dZR+AlfA
2015-08-31  2:43 ` dyoung-H+wXaHxf7aLQT0dZR+AlfA [this message]
2015-08-31  2:43 ` [patch 6/6] [PATCH 4/5] Revert "Let user specify the action after fail" dyoung-H+wXaHxf7aLQT0dZR+AlfA
     [not found] ` <20150831024314.798498962-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-09-29  8:11   ` [patch 0/6] Revert action_on_fail patches Dave Young
     [not found]     ` <20150929081150.GD30623-sa4SJRhfYT7Js+WLOFIw6R/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2015-11-13 12:43       ` Harald Hoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150831024414.030029156@redhat.com \
    --to=dyoung-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
    --cc=bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox