From ed66eafd0592bcc270dc61f64f4d91cf7ea91e30 Mon Sep 17 00:00:00 2001 From: Savyasachee Jha Date: Mon, 14 Feb 2022 18:15:16 +0530 Subject: [PATCH] Remove absolute paths to udev rules and binaries for dracut MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since dracut functions can locate both udev rules and binaries, there is no point in keeping absolute paths in the module setup script. It also breaks the --sysroot option in dracut. This commit removes mentions to absolute paths for binaries and udev rules. Reviewed-by: Ahelenia Ziemiańska Reviewed-by: Andrew J. Hesford Signed-off-by: Savyasachee Jha Closes #13010 --- contrib/dracut/90zfs/module-setup.sh.in | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in index 5ab068632d..81c541f49b 100755 --- a/contrib/dracut/90zfs/module-setup.sh.in +++ b/contrib/dracut/90zfs/module-setup.sh.in @@ -23,20 +23,13 @@ installkernel() { } install() { - for i in "90-zfs.rules" "69-vdev.rules" "60-zvol.rules"; do - if ! dracut_install "@udevdir@/$i"; then - dfatal "Failed to install udev rule: $i" - exit 1 - fi - done + inst_rules 90-zfs.rules 69-vdev.rules 60-zvol.rules inst_multiple \ - @sbindir@/zgenhostid \ - @sbindir@/zfs \ - @sbindir@/zpool \ - @udevdir@/vdev_id \ - @udevdir@/zvol_id \ - @mounthelperdir@/mount.zfs \ + zgenhostid \ + zfs \ + zpool \ + mount.zfs \ hostid \ grep \ awk \