32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
|
From cccc1e9ff2d80c7277563fd8fa35f44db48d2fd9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>
|
||
|
|
Date: Tue, 15 Feb 2022 20:26:33 +0100
|
||
|
|
Subject: [PATCH] (#2050560) fix(url-lib): make pre-pivot hook separetely per
|
||
|
|
nfs mount (#24)
|
||
|
|
|
||
|
|
* fix(url-lib): make pre-pivot hook separetely per nfs mount
|
||
|
|
|
||
|
|
(cherry picked from commit 2f091b17075f81ff490b05d3d566d736fc32f0be)
|
||
|
|
(cherry picked from commit acb18869e98687a3f8c172d7e7befaa5326cf67a)
|
||
|
|
(cherry picked from commit ec50cec3bd9169410df409e077d0487c63c2a627)
|
||
|
|
|
||
|
|
Resolves: #2050560
|
||
|
|
---
|
||
|
|
modules.d/45url-lib/url-lib.sh | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
|
||
|
|
index e1e7d5af..b68f72b0 100755
|
||
|
|
--- a/modules.d/45url-lib/url-lib.sh
|
||
|
|
+++ b/modules.d/45url-lib/url-lib.sh
|
||
|
|
@@ -159,7 +159,7 @@ nfs_fetch_url() {
|
||
|
|
mntdir="$(mkuniqdir /run nfs_mnt)"
|
||
|
|
mount_nfs "$nfs:$server:$filepath${options:+:$options}" "$mntdir"
|
||
|
|
# lazy unmount during pre-pivot hook
|
||
|
|
- inst_hook --hook pre-pivot --name 99url-lib-umount-nfs umount -l -- "$mntdir"
|
||
|
|
+ inst_hook --hook pre-pivot --name 99url-lib-umount-nfs-"$(basename "$mntdir")" umount -l -- "$mntdir"
|
||
|
|
fi
|
||
|
|
|
||
|
|
if [ -z "$outloc" ]; then
|
||
|
|
|