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