forked from pool/kdump
8c4cc920f8
- kdump-calibrate-Update-values.patch: calibrate: Update values. - kdump-prefer-by-path-and-device-mapper.patch: Prefer by-path and device-mapper aliases over kernel device names (bsc#1101149, LTC#168532). - kdump-powerpc-no-reload-on-CPU-removal.patch: powerpc: Do not reload on CPU hot removal (bsc#1133407, LTC#176111). - kdump-Add-force-option-to-KDUMP_NETCONFIG.patch: Add ":force" option to KDUMP_NETCONFIG (bsc#1108919). - kdump-Add-fence_kdump_send-when-fence-agents-installed.patch: Add fence_kdump_send when fence-agents installed (bsc#1108919). - kdump-FENCE_KDUMP_SEND-variable.patch: Use var for path of fence_kdump_send and remove the unnecessary PRESCRIPT check (bsc#1108919). - kdump-Document-fence_kdump_send.patch: Document kdump behaviour for fence_kdump_send (bsc#1108919). - kdump-nss-modules.patch: Improve the handling of NSS (bsc#1021846). - kdump-skip-mounts-if-no-proc-vmcore.patch: Skip kdump-related mounts if there is no /proc/vmcore (bsc#1102252, bsc#1125011). - kdump-clean-up-kdump-mount-points.patch: Make sure that kdump mount points are cleaned up (bsc#1102252, bsc#1125011). - kdump-Clean-up-the-use-of-current-vs-boot-network-iface.patch: Clean up the use of current vs. boot network interface names (bsc#1094444, bsc#1116463, bsc#1141064). - kdump-Use-a-custom-namespace-for-physical-NICs.patch: Use a custom namespace for physical NICs (bsc#1094444, bsc#1116463, bsc#1141064). - kdump-preserve-white-space.patch: Preserve white space when removing kernel command line options (bsc#1117652). OBS-URL: https://build.opensuse.org/request/show/757490 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=188
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From: Petr Tesarik <ptesarik@suse.com>
|
|
Date: Mon, 2 Sep 2019 15:27:24 +0200
|
|
Subject: Skip kdump-related mounts if there is no /proc/vmcore
|
|
References: bsc#1102252, bsc#1125011
|
|
Upstream: merged
|
|
Git-commit b91c1e16d373e5631ce725acf52db097d8248389
|
|
|
|
With FADUMP, the same initrd is used for saving a dump and for
|
|
normal boot. It is not necessary to mount kdump-related filesystems
|
|
on a normal boot, so let's add a systemd condition.
|
|
|
|
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
|
|
|
|
---
|
|
init/module-setup.sh | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
--- a/init/module-setup.sh
|
|
+++ b/init/module-setup.sh
|
|
@@ -249,13 +249,18 @@ install() {
|
|
"$initdir/$systemdsystemunitdir"/kdump-save.service
|
|
|
|
local _d _mp
|
|
+ local _mnt
|
|
_d="$initdir/$systemdsystemunitdir"/initrd-switch-root.target.d
|
|
mkdir -p "$_d"
|
|
(
|
|
echo "[Unit]"
|
|
for _mp in "${kdump_mnt[@]}" ; do
|
|
- echo -n "Conflicts="
|
|
- systemd-escape -p --suffix=mount "$_mp"
|
|
+ _mnt=$(systemd-escape -p --suffix=mount "$_mp")
|
|
+ _d="$initdir/$systemdsystemunitdir/$_mnt".d
|
|
+ mkdir -p "$_d"
|
|
+ echo -e "[Unit]\nConditionPathExists=/proc/vmcore" \
|
|
+ > "$_d"/kdump.conf
|
|
+ echo "Conflicts=$_mnt"
|
|
done
|
|
) > "$_d"/kdump.conf
|
|
|