diff options
| author | Savyasachee Jha <genghizkhan91@hawkradius.com> | 2022-02-14 12:45:16 +0000 |
|---|---|---|
| committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2022-05-25 18:09:23 +0000 |
| commit | 4252517f5fad1140787cdc74b0faf44395285c36 (patch) | |
| tree | 5b4c066eaac422811844cfb760c389f234577ea7 | |
| parent | ebbfc6cb853d2d2f3f0671362d5ff5588be39e9d (diff) | |
| download | src-4252517f5fad1140787cdc74b0faf44395285c36.tar.gz src-4252517f5fad1140787cdc74b0faf44395285c36.zip | |
Remove absolute paths to udev rules and binaries for dracut
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 <nabijaczleweli@nabijaczleweli.xyz>
Reviewed-by: Andrew J. Hesford <ajh@sideband.org>
Signed-off-by: Savyasachee Jha <hi@savyasacheejha.com>
Closes #13010
| -rwxr-xr-x | contrib/dracut/90zfs/module-setup.sh.in | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in index 3b86c293dc39..19f1d1b161be 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 \ |