diff options
| author | Kyle Fuller <[email protected]> | 2011-08-06 18:28:16 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-08-19 16:26:13 -0700 |
| commit | 146cde8f4acd52d258ba80817dd1134702a91954 (patch) | |
| tree | 7dbd1a5844e75616d3ff9477a1217c957d209d12 /dracut | |
| parent | 9c4f40b894dd5b5c2ef18546d23d7e91095ac509 (diff) | |
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 <[email protected]>
Diffstat (limited to 'dracut')
| -rw-r--r-- | dracut/90zfs/90-zfs.rules | 10 | ||||
| -rw-r--r-- | dracut/90zfs/Makefile.am | 1 | ||||
| -rw-r--r-- | dracut/90zfs/Makefile.in | 1 | ||||
| -rwxr-xr-x | dracut/90zfs/module-setup.sh | 2 |
4 files changed, 1 insertions, 13 deletions
diff --git a/dracut/90zfs/90-zfs.rules b/dracut/90zfs/90-zfs.rules deleted file mode 100644 index 52e1d6393..000000000 --- a/dracut/90zfs/90-zfs.rules +++ /dev/null @@ -1,10 +0,0 @@ -SUBSYSTEM!="block", GOTO="zfs_end" -ACTION!="add|change", GOTO="zfs_end" - -ENV{ID_FS_TYPE}=="zfs", RUN+="/sbin/modprobe zfs" -ENV{ID_FS_TYPE}=="zfs_member", RUN+="/sbin/modprobe zfs" - -KERNEL=="null", SYMLINK+="root" -SYMLINK=="null", SYMLINK+="root" - -LABEL="zfs_end" diff --git a/dracut/90zfs/Makefile.am b/dracut/90zfs/Makefile.am index 605654c23..44aaf61b2 100644 --- 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 b63595be0..009313047 100644 --- 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 822f89988..23735e31e 100755 --- 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 |