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>

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

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

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

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)

dracut/90zfs/Makefile.am

@@ -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)

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}