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