SHA256
1
0
forked from pool/kdump
kdump/kdump-clean-up-kdump-mount-points.patch
Petr Tesařík 8c4cc920f8 Accepting request 757490 from home:ptesarik:branches:Kernel:kdump
- 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
2019-12-17 10:11:52 +00:00

42 lines
1.4 KiB
Diff

From: Petr Tesarik <ptesarik@suse.com>
Date: Mon, 2 Sep 2019 10:01:47 +0200
Subject: Make sure that kdump mount points are cleaned up
References: bsc#1102252, bsc#1125011
Upstream: merged
Git-commit 83e48556428339668e6f23e1dccc0196a52d1b68
If the system continues to boot, kdump mount points must be
unmounted before switching to the system root. Otherwise, some
filesystems may remain mounted under the now-unavailable initrd
root, keeping the underlying devices busy during system shutdown.
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
---
init/module-setup.sh | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
--- a/init/module-setup.sh
+++ b/init/module-setup.sh
@@ -246,7 +246,19 @@ install() {
gsub(/@KDUMP_MOUNTPOINTS@/, mountpoints)
print
}' "$moddir/kdump-save.service.in" > \
- "$initdir/$systemdsystemunitdir"/kdump-save.service
+ "$initdir/$systemdsystemunitdir"/kdump-save.service
+
+ local _d _mp
+ _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"
+ done
+ ) > "$_d"/kdump.conf
+
ln_r "$systemdsystemunitdir"/kdump-save.service \
"$systemdsystemunitdir"/initrd.target.wants/kdump-save.service
else