75f812af59
- fix btrfs mount flags for /usr - degrade message about missing tools for stripping Resolves: rhbz#958519 - set environment vars DRACUT_SYSTEMD, NEWROOT in service file Resolves: rhbz#963159 - don't add volatile swap partitions to host_devs - add libssl.so.10 to make kdump work with fips mode - readd selinux dracut module for kdump - url-lib/url-lib.sh: turn off curl globbing Resolves: rhbz#907497 - include btrfs-zero-log in the initramfs Resolves: rhbz#963257 - proper NAME the network interfaces Resolves: rhbz#965842 - install default font latarcyrheb-sun16 Resolves: rhbz#927564 - optionally install /etc/pcmcia/config.opts Resolves: rhbz#920076 - fix ONBOOT for slaves, set TYPE=Bond for bonding Resolves: rhbz#919001 - add nvme kernel module Resolves: rhbz#910734 - add xfs_metadump - selinux: load_policy script fix - add hid-hyperv and hv-vmbus kernel modules - add parameter rd.live.squashimg Resolves: rhbz#789036 rhbz#782108 - wait for all required interfaces if "rd.neednet=1" Resolves: rhbz#801829 - lvm: add tools for thin provisioning Resolves: rhbz#921235 - ifcfg/write-ifcfg.sh: fixed ifcfg file generation - do not wait for mpath* devices Resolves: rhbz#969068
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 679fa7ed3c0f4c827bfc6885d34f56713fe85c1e Mon Sep 17 00:00:00 2001
|
|
From: Baoquan He <bhe@redhat.com>
|
|
Date: Wed, 29 May 2013 14:33:06 +0800
|
|
Subject: [PATCH] 99fs-lib/fs-lib.sh: Let user specify the action after fail
|
|
for fsck
|
|
|
|
The fsck is ignored when replace emergency_shell with action_on_fail,
|
|
now add it.
|
|
|
|
Signed-off-by: Baoquan He <bhe@redhat.com>
|
|
---
|
|
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 e1f3074..88e7348 100755
|
|
--- a/modules.d/99fs-lib/fs-lib.sh
|
|
+++ b/modules.d/99fs-lib/fs-lib.sh
|
|
@@ -7,14 +7,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"
|
|
- emergency_shell -n "(reboot ?)"
|
|
+ action_on_fail -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."
|
|
- emergency_shell -n "(Repair filesystem)"
|
|
+ action_on_fail -n "(Repair filesystem)"
|
|
}
|
|
|
|
# inherits: _ret _drv _out
|