Move 90-zfs udev rule from dracut to udev/rules.d

This rule does not need to be dracut specific.  Automatically loading
the zfs module stack when a zfs device is detected is usually desirable.
My only concern is that this might cause trouble for large pools where
we don't want to automatically import the pool until all the disks are
available.  However, we'll cross that bridge when we come to it.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/dracut/90zfs/Makefile.am b/dracut/90zfs/Makefile.am
index 605654c233b0b7e5ec6a5b7ad8868e023fa94ba5..44aaf61b21fe9f346b233284d317f7f571bd678f 100644 (file)
--- a/dracut/90zfs/Makefile.am
+++ b/dracut/90zfs/Makefile.am
@@ -1,6 +1,5 @@
 pkgdracutdir = $(datadir)/dracut/modules.d/90zfs
 dist_pkgdracut_SCRIPTS = \
-       $(top_srcdir)/dracut/90zfs/90-zfs.rules \
        $(top_srcdir)/dracut/90zfs/module-setup.sh \
        $(top_srcdir)/dracut/90zfs/mount-zfs.sh \
        $(top_srcdir)/dracut/90zfs/parse-zfs.sh

diff --git a/dracut/90zfs/Makefile.in b/dracut/90zfs/Makefile.in
index b63595be08c7e0fa56408d438455b7ee1fccb137..0093130475d8f904fa67e341d470b996b9a20686 100644 (file)
--- a/dracut/90zfs/Makefile.in
+++ b/dracut/90zfs/Makefile.in
@@ -293,7 +293,6 @@ udevdir = @udevdir@
 udevruledir = @udevruledir@
 pkgdracutdir = $(datadir)/dracut/modules.d/90zfs
 dist_pkgdracut_SCRIPTS = \
-       $(top_srcdir)/dracut/90zfs/90-zfs.rules \
        $(top_srcdir)/dracut/90zfs/module-setup.sh \
        $(top_srcdir)/dracut/90zfs/mount-zfs.sh \
        $(top_srcdir)/dracut/90zfs/parse-zfs.sh

diff --git a/dracut/90zfs/module-setup.sh b/dracut/90zfs/module-setup.sh
index 822f89988e6184c441d8567bb95ad1a0495b30a5..23735e31e077695410794e61b26a221aecbd8a7d 100755 (executable)
--- a/dracut/90zfs/module-setup.sh
+++ b/dracut/90zfs/module-setup.sh
@@ -28,7 +28,7 @@ installkernel() {
 }
 
 install() {
-       inst_rules "$moddir/90-zfs.rules"
+       inst_rules /lib/udev/rules.d/90-zfs.rules
        inst_rules /lib/udev/rules.d/60-zpool.rules
        inst_rules /lib/udev/rules.d/60-zvol.rules
        inst /etc/zfs/zdev.conf

diff --git a/udev/rules.d/.gitignore b/udev/rules.d/.gitignore
index e56d65ef8e063d1740c42e00a1b274e4c77e4a3b..939962d478ef209c5723decd66077c6398fcd74f 100644 (file)
--- a/udev/rules.d/.gitignore
+++ b/udev/rules.d/.gitignore
@@ -1,2 +1,3 @@
 60-zpool.rules
 60-zvol.rules
+90-zfs.rules

diff --git a/dracut/90zfs/90-zfs.rules b/udev/rules.d/90-zfs.rules.in
similarity index 100%
rename from dracut/90zfs/90-zfs.rules
rename to udev/rules.d/90-zfs.rules.in

diff --git a/udev/rules.d/Makefile.am b/udev/rules.d/Makefile.am
index 41740517eb4230f99e947e160b4c509971e6df4d..bb4eedfe9ccc3d75575d398533704fcb38384d57 100644 (file)
--- a/udev/rules.d/Makefile.am
+++ b/udev/rules.d/Makefile.am
@@ -1,14 +1,20 @@
 udevrule_DATA = \
-       60-zpool.rules \
-       60-zvol.rules
+       $(top_srcdir)/udev/rules.d/60-zpool.rules \
+       $(top_srcdir)/udev/rules.d/60-zvol.rules \
+       $(top_srcdir)/udev/rules.d/90-zfs.rules
 
 EXTRA_DIST = \
-       60-zpool.rules.in \
-       60-zvol.rules.in
+       $(top_srcdir)/udev/rules.d/60-zpool.rules.in \
+       $(top_srcdir)/udev/rules.d/60-zvol.rules.in \
+       $(top_srcdir)/udev/rules.d/90-zfs.rules.in
 
 $(udevrule_DATA):
-       -$(SED) -e 's,@udevdir\@,$(udevdir),g' '$@.in' >'$@'
+       -$(SED) -e 's,@bindir\@,$(bindir),g' \
+               -e 's,@sbindir\@,$(sbindir),g' \
+               -e 's,@udevdir\@,$(udevdir),g' \
+               -e 's,@udevruledir\@,$(udevruledir),g' \
+               -e 's,@sysconfdir\@,$(sysconfdir),g' \
+               '$@.in' >'$@'
 
 distclean-local::
        -$(RM) $(udevrule_DATA)
-

diff --git a/udev/rules.d/Makefile.in b/udev/rules.d/Makefile.in
index 06ef0a970ca43e115037f39133dc48ea1443cdf7..a91f67edc83e59b18ec5e9427f8135e20b377f75 100644 (file)
--- a/udev/rules.d/Makefile.in
+++ b/udev/rules.d/Makefile.in
@@ -291,12 +291,14 @@ top_srcdir = @top_srcdir@
 udevdir = @udevdir@
 udevruledir = @udevruledir@
 udevrule_DATA = \
-       60-zpool.rules \
-       60-zvol.rules
+       $(top_srcdir)/udev/rules.d/60-zpool.rules \
+       $(top_srcdir)/udev/rules.d/60-zvol.rules \
+       $(top_srcdir)/udev/rules.d/90-zfs.rules
 
 EXTRA_DIST = \
-       60-zpool.rules.in \
-       60-zvol.rules.in
+       $(top_srcdir)/udev/rules.d/60-zpool.rules.in \
+       $(top_srcdir)/udev/rules.d/60-zvol.rules.in \
+       $(top_srcdir)/udev/rules.d/90-zfs.rules.in
 
 all: all-am
 
@@ -509,7 +511,12 @@ uninstall-am: uninstall-udevruleDATA
 
 
 $(udevrule_DATA):
-       -$(SED) -e 's,@udevdir\@,$(udevdir),g' '$@.in' >'$@'
+       -$(SED) -e 's,@bindir\@,$(bindir),g' \
+               -e 's,@sbindir\@,$(sbindir),g' \
+               -e 's,@udevdir\@,$(udevdir),g' \
+               -e 's,@udevruledir\@,$(udevruledir),g' \
+               -e 's,@sysconfdir\@,$(sysconfdir),g' \
+               '$@.in' >'$@'
 
 distclean-local::
        -$(RM) $(udevrule_DATA)

diff --git a/zfs.spec.in b/zfs.spec.in
index 56e8c4764581d9a00fd49d5893c68f3b46123f83..3f3142a16b7ece2dd452bb0b12f214d03d0371ae 100644 (file)
--- a/zfs.spec.in
+++ b/zfs.spec.in
@@ -82,7 +82,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/init.d/*
 %{_sysconfdir}/zfs/*
 %{_udevdir}/*
-%{_udevdir}/rules.d/*
 
 %files devel
 %defattr(-,root,root)