Marcus Meissner
0f203926a1
- Rename patch:
* From 0211-fix_multipath_check_hostonly.patch
to 0303-fix_multipath_check_hostonly.patch
- Rename patch:
* From 0213-10i18n-keymap-find.patch
to 0213-Fix-wrong-keymap-inclusion.patch
- 95fcoe: Do not complain about missing /etc/hba.conf (bsc#980539)
* Add 0215-95fcoe-Do-not-complain-about-missing-etc-hba.conf.patch
- 95fcoe: silence lldpad warnings
* Add 0216-95fcoe-silence-lldpad-warnings.patch
- 95fcoe: Allow to specify the FCoE mode via the fcoe= parameter
* Add 0217-95fcoe-Allow-to-specify-the-FCoE-mode-via-the-fcoe-p.patch
- 40network: allow persistent interface names (bsc#995284)
* Add 0218-40network-allow-persistent-interface-names.patch
- 95fcoe: use interface names instead of MAC addresses
* Add 0219-95fcoe-use-interface-names-instead-of-MAC-addresses.patch
- 95fcoe: always set AUTO_VLAN for fcoemon (bsc#995019)
* Add 0220-95fcoe-always-set-AUTO_VLAN-for-fcoemon.patch
- 95fcoe: Add shutdown script (bsc#994860)
* Add 0221-95fcoe-Add-shutdown-script.patch
- 90dm: Fixup shutdown script (bsc#994860)
* Add 0222-90dm-Fixup-shutdown-script.patch
- 90dm: fixup dependency cycle between MD and DM shutdown (bsc#994860)
* Add 0223-90dm-fixup-dependency-cycle-between-MD-and-DM-shutdo.patch
- 90multipath: Start daemon after udev settle (bsc#986734)
* Add 0304-90multipath-Start-daemon-after-udev-settle.patch
- 90multipath: load dm_multipath module during startup
* Add 0305-90multipath-load-dm_multipath-module-during-startup.patch
- 90multipath: add shutdown script (bsc#994860)
OBS-URL: https://build.opensuse.org/request/show/422869
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=263
56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From 033e11927e1f7f3d1163ba78dfd5e7a6bad41ee7 Mon Sep 17 00:00:00 2001
|
|
From: Mark Fasheh <mfasheh@suse.de>
|
|
Date: Fri, 24 Jun 2016 15:11:17 -0700
|
|
Subject: [PATCH] dracut-emergency: optionally print fs help
|
|
|
|
Allow filesystem modules to install a fs-specific text file with
|
|
instructions on what to do when mount fails. This is printed when we go into
|
|
an emergency shell.
|
|
|
|
Signed-off-by: Mark Fasheh <mfasheh@suse.de>
|
|
---
|
|
dracut-init.sh | 6 ++++++
|
|
modules.d/98dracut-systemd/dracut-emergency.sh | 2 ++
|
|
2 files changed, 8 insertions(+)
|
|
|
|
diff --git a/dracut-init.sh b/dracut-init.sh
|
|
index 0fda778..c941390 100644
|
|
--- a/dracut-init.sh
|
|
+++ b/dracut-init.sh
|
|
@@ -240,6 +240,12 @@ inst_script() {
|
|
(($? != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$@" || :
|
|
}
|
|
|
|
+inst_fsck_help() {
|
|
+ local _helper="/usr/share/fsck/fsck_help_$1.txt"
|
|
+ $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$2" $_helper
|
|
+ (($? != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${loginstall:+-L "$loginstall"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$2" $_helper || :
|
|
+}
|
|
+
|
|
mark_hostonly() {
|
|
for i in "$@"; do
|
|
echo "$i" >> "$initdir/lib/dracut/hostonly-files"
|
|
diff --git a/modules.d/98dracut-systemd/dracut-emergency.sh b/modules.d/98dracut-systemd/dracut-emergency.sh
|
|
index 26be291..2d9ecd7 100755
|
|
--- a/modules.d/98dracut-systemd/dracut-emergency.sh
|
|
+++ b/modules.d/98dracut-systemd/dracut-emergency.sh
|
|
@@ -16,6 +16,7 @@ source_hook "$hook"
|
|
|
|
|
|
if getargbool 1 rd.shell -d -y rdshell || getarg rd.break -d rdbreak; then
|
|
+ FSTXT="/usr/share/fsck/fsck_help_$fstype.txt"
|
|
echo
|
|
rdsosreport
|
|
echo
|
|
@@ -26,6 +27,7 @@ if getargbool 1 rd.shell -d -y rdshell || getarg rd.break -d rdbreak; then
|
|
echo 'after mounting them and attach it to a bug report.'
|
|
echo
|
|
echo
|
|
+ [ -f $FSTXT ] && cat $FSTXT
|
|
[ -f /etc/profile ] && . /etc/profile
|
|
[ -z "$PS1" ] && export PS1="$_name:\${PWD}# "
|
|
exec sh -i -l
|
|
--
|
|
2.6.6
|
|
|