Move dracut directory to contrib

The dracut code is analogous to the initramfs code and as such
it should be located in the contrib with initramfs for consistency.

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

diff --git a/Makefile.am b/Makefile.am
index 788122d2aac9738d8355a04e4fd72b3fa02b4b11..10c87ddcd4b39214b9e04e12de21dc93a8791c2a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ include $(top_srcdir)/config/tgz.am
 
 SUBDIRS = include rpm
 if CONFIG_USER
-SUBDIRS += dracut udev etc man scripts lib cmd contrib
+SUBDIRS += udev etc man scripts lib cmd contrib
 endif
 if CONFIG_KERNEL
 SUBDIRS += module

diff --git a/configure.ac b/configure.ac
index 0e79a491cdc5b24f43e2fdda07616153147c3b39..9907857e2e12844f78a26a61433f19a5827c2a3c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -58,8 +58,6 @@ ZFS_AC_DEBUG_DMU_TX
 
 AC_CONFIG_FILES([ 
        Makefile
-       dracut/Makefile
-       dracut/90zfs/Makefile
        udev/Makefile
        udev/rules.d/Makefile
        etc/Makefile
@@ -115,6 +113,8 @@ AC_CONFIG_FILES([
        cmd/zed/Makefile
        contrib/Makefile
        contrib/bash_completion.d/Makefile
+       contrib/dracut/Makefile
+       contrib/dracut/90zfs/Makefile
        contrib/initramfs/Makefile
        module/Makefile
        module/avl/Makefile

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 4a13cfa98019205874a1bf80662ed9cba2523732..b05e5c45b3cdc91ad980a8f317ba342b7cdded74 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = bash_completion.d initramfs
-DIST_SUBDIRS = bash_completion.d initramfs
+SUBDIRS = bash_completion.d dracut initramfs
+DIST_SUBDIRS = bash_completion.d dracut initramfs

diff --git a/dracut/90zfs/.gitignore b/contrib/dracut/90zfs/.gitignore
similarity index 100%
rename from dracut/90zfs/.gitignore
rename to contrib/dracut/90zfs/.gitignore

diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am
new file mode 100644 (file)
index 0000000..30880bf
--- /dev/null
+++ b/contrib/dracut/90zfs/Makefile.am
@@ -0,0 +1,25 @@
+pkgdracutdir = $(dracutdir)/modules.d/90zfs
+pkgdracut_SCRIPTS = \
+       $(top_srcdir)/contrib/dracut/90zfs/export-zfs.sh \
+       $(top_srcdir)/contrib/dracut/90zfs/module-setup.sh \
+       $(top_srcdir)/contrib/dracut/90zfs/mount-zfs.sh \
+       $(top_srcdir)/contrib/dracut/90zfs/parse-zfs.sh \
+       $(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh
+
+EXTRA_DIST = \
+       $(top_srcdir)/contrib/dracut/90zfs/export-zfs.sh.in \
+       $(top_srcdir)/contrib/dracut/90zfs/module-setup.sh.in \
+       $(top_srcdir)/contrib/dracut/90zfs/mount-zfs.sh.in \
+       $(top_srcdir)/contrib/dracut/90zfs/parse-zfs.sh.in \
+       $(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh.in
+
+$(pkgdracut_SCRIPTS):
+       -$(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) $(pkgdracut_SCRIPTS)

diff --git a/dracut/90zfs/export-zfs.sh.in b/contrib/dracut/90zfs/export-zfs.sh.in
similarity index 100%
rename from dracut/90zfs/export-zfs.sh.in
rename to contrib/dracut/90zfs/export-zfs.sh.in

diff --git a/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in
similarity index 100%
rename from dracut/90zfs/module-setup.sh.in
rename to contrib/dracut/90zfs/module-setup.sh.in

diff --git a/dracut/90zfs/mount-zfs.sh.in b/contrib/dracut/90zfs/mount-zfs.sh.in
similarity index 100%
rename from dracut/90zfs/mount-zfs.sh.in
rename to contrib/dracut/90zfs/mount-zfs.sh.in

diff --git a/dracut/90zfs/parse-zfs.sh.in b/contrib/dracut/90zfs/parse-zfs.sh.in
similarity index 100%
rename from dracut/90zfs/parse-zfs.sh.in
rename to contrib/dracut/90zfs/parse-zfs.sh.in

diff --git a/dracut/90zfs/zfs-lib.sh.in b/contrib/dracut/90zfs/zfs-lib.sh.in
similarity index 100%
rename from dracut/90zfs/zfs-lib.sh.in
rename to contrib/dracut/90zfs/zfs-lib.sh.in

diff --git a/dracut/Makefile.am b/contrib/dracut/Makefile.am
similarity index 100%
rename from dracut/Makefile.am
rename to contrib/dracut/Makefile.am

diff --git a/dracut/README.dracut.markdown b/contrib/dracut/README.dracut.markdown
similarity index 100%
rename from dracut/README.dracut.markdown
rename to contrib/dracut/README.dracut.markdown

diff --git a/dracut/90zfs/Makefile.am b/dracut/90zfs/Makefile.am
deleted file mode 100644 (file)
index 650953c..0000000
--- a/dracut/90zfs/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgdracutdir = $(dracutdir)/modules.d/90zfs
-pkgdracut_SCRIPTS = \
-       $(top_srcdir)/dracut/90zfs/export-zfs.sh \
-       $(top_srcdir)/dracut/90zfs/module-setup.sh \
-       $(top_srcdir)/dracut/90zfs/mount-zfs.sh \
-       $(top_srcdir)/dracut/90zfs/parse-zfs.sh \
-       $(top_srcdir)/dracut/90zfs/zfs-lib.sh
-
-EXTRA_DIST = \
-       $(top_srcdir)/dracut/90zfs/export-zfs.sh.in \
-       $(top_srcdir)/dracut/90zfs/module-setup.sh.in \
-       $(top_srcdir)/dracut/90zfs/mount-zfs.sh.in \
-       $(top_srcdir)/dracut/90zfs/parse-zfs.sh.in \
-       $(top_srcdir)/dracut/90zfs/zfs-lib.sh.in
-
-$(pkgdracut_SCRIPTS):
-       -$(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) $(pkgdracut_SCRIPTS)

diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index 50b61f01074be5657bd7f620270422426d723800..68bc001926521cd4615618327b252c02224cf871 100644 (file)
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -313,7 +313,7 @@ exit 0
 %{_datadir}/%{name}
 
 %files dracut
-%doc dracut/README.dracut.markdown
+%doc contrib/dracut/README.dracut.markdown
 %{_dracutdir}/modules.d/*
 
 %if 0%{?_initramfs}