move 90crypt, 90dm, 90dmraid, 90lvm, 90dmsquash-live modules from extra to main package

and requirements for new modules
move caps to extras ('caps: does not work with systemd in the initramfs') [release 037-7mamba;Thu Jun 26 2014]

dracut.spec

@@ -1,6 +1,6 @@
 Name:          dracut
 Version:       037
-Release:       4mamba
+Release:       7mamba
 Summary:       Generic, modular initramfs generation tool that can be used across various distributions
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -70,6 +70,17 @@ Requires:      curl
 Requires:      tar
 Requires:      openssh-clients
 Requires:      cifs-utils
+Requires:      open-fcoe
+Requires:      open-lldp
+Requires:      multipath-tools
+Requires:      open-iscsi
+%ifnarch arm
+Requires:      biosdevname
+%endif
+Requires:      nbd
+Requires:      lvm2
+Requires:      dmraid
+Requires:      cryptsetup
 Provides:      mkinitramfs
 Obsoletes:     mkinitramfs
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
@@ -80,6 +91,7 @@ Dracut is a generic, modular initramfs generation tool that can be used across v
 %package modules-extras
 Summary:       Extra optional modules for dracut
 Group:         Development/Libraries
+Requires:      bootchart
 Requires:      %{name} = %{version}-%{release}
 
 %description modules-extras
@@ -129,6 +141,10 @@ install -d -m0755 %{buildroot}%{_sbindir}
 ln -s ../bin/dracut %{buildroot}%{_sbindir}/dracut
 ln -s ../bin/mkinitrd %{buildroot}%{_sbindir}/mkinitrd
 
+%ifarch arm
+rm -rf %{buildroot}%{_prefix}/lib/dracut/modules.d/97biosdevname
+%endif
+
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -160,8 +176,6 @@ ln -s ../bin/mkinitrd %{buildroot}%{_sbindir}/mkinitrd
 %{_prefix}/lib/dracut/modules.d/00dash/*
 %dir %{_prefix}/lib/dracut/modules.d/01fips
 %{_prefix}/lib/dracut/modules.d/01fips/*
-%dir %{_prefix}/lib/dracut/modules.d/02caps
-%{_prefix}/lib/dracut/modules.d/02caps/*
 %dir %{_prefix}/lib/dracut/modules.d/02fips-aesni
 %{_prefix}/lib/dracut/modules.d/02fips-aesni/*
 %dir %{_prefix}/lib/dracut/modules.d/03rescue
@@ -192,6 +206,16 @@ ln -s ../bin/mkinitrd %{buildroot}%{_sbindir}/mkinitrd
 #%{_prefix}/lib/dracut/modules.d/90bcache/module-setup.sh
 %dir %{_prefix}/lib/dracut/modules.d/90btrfs
 %{_prefix}/lib/dracut/modules.d/90btrfs/*
+%dir %{_prefix}/lib/dracut/modules.d/90crypt
+%{_prefix}/lib/dracut/modules.d/90crypt/*
+%dir %{_prefix}/lib/dracut/modules.d/90dm
+%{_prefix}/lib/dracut/modules.d/90dm/*
+%dir %{_prefix}/lib/dracut/modules.d/90dmraid
+%{_prefix}/lib/dracut/modules.d/90dmraid/*
+%dir %{_prefix}/lib/dracut/modules.d/90dmsquash-live
+%{_prefix}/lib/dracut/modules.d/90dmsquash-live/*
+%dir %{_prefix}/lib/dracut/modules.d/90lvm
+%{_prefix}/lib/dracut/modules.d/90lvm/*
 %dir %{_prefix}/lib/dracut/modules.d/90kernel-modules
 %{_prefix}/lib/dracut/modules.d/90kernel-modules/*
 %dir %{_prefix}/lib/dracut/modules.d/90livenet
@@ -252,8 +276,10 @@ ln -s ../bin/mkinitrd %{buildroot}%{_sbindir}/mkinitrd
 %{_prefix}/lib/dracut/modules.d/96securityfs/*
 %dir %{_prefix}/lib/dracut/modules.d/98usrmount
 %{_prefix}/lib/dracut/modules.d/98usrmount/*
+%ifnarch arm
 %dir %{_prefix}/lib/dracut/modules.d/97biosdevname
 %{_prefix}/lib/dracut/modules.d/97biosdevname/*
+%endif
 %dir %{_prefix}/lib/dracut/modules.d/97masterkey
 %{_prefix}/lib/dracut/modules.d/97masterkey/*
 %dir %{_prefix}/lib/dracut/modules.d/98ecryptfs
@@ -314,23 +340,26 @@ ln -s ../bin/mkinitrd %{buildroot}%{_sbindir}/mkinitrd
 %defattr(-,root,root)
 %dir %{_prefix}/lib/dracut/modules.d/00bootchart
 %{_prefix}/lib/dracut/modules.d/00bootchart/*
+%dir %{_prefix}/lib/dracut/modules.d/02caps
+%{_prefix}/lib/dracut/modules.d/02caps/*
 %dir %{_prefix}/lib/dracut/modules.d/05busybox
 %{_prefix}/lib/dracut/modules.d/05busybox/module-setup.sh
-%dir %{_prefix}/lib/dracut/modules.d/90crypt
-%{_prefix}/lib/dracut/modules.d/90crypt/*
-%dir %{_prefix}/lib/dracut/modules.d/90dm
-%{_prefix}/lib/dracut/modules.d/90dm/*
-%dir %{_prefix}/lib/dracut/modules.d/90dmraid
-%{_prefix}/lib/dracut/modules.d/90dmraid/*
-%dir %{_prefix}/lib/dracut/modules.d/90dmsquash-live
-%{_prefix}/lib/dracut/modules.d/90dmsquash-live/*
 %dir %{_prefix}/lib/dracut/modules.d/50gensplash
 %{_prefix}/lib/dracut/modules.d/50gensplash/*
-%dir %{_prefix}/lib/dracut/modules.d/90lvm
-%{_prefix}/lib/dracut/modules.d/90lvm/*
 %doc NEWS README README.generic README.kernel README.modules TODO
 
 %changelog
+* Thu Jun 26 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 037-7mamba
+- move 90crypt, 90dm, 90dmraid, 90lvm, 90dmsquash-live modules from extra to main package
+- and requirements for new modules
+- move caps to extras ('caps: does not work with systemd in the initramfs')
+
+* Tue Jun 24 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 037-6mamba
+- also require biosdevname and nbd
+
+* Tue Jun 24 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 037-5mamba
+- require open-fcoe, open-lldp, open-iscsi and multipath-tools
+
 * Wed Apr 16 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 037-4mamba
 - squash-overlayfs-live-openmamba: workaround to fix problem since udev 212 about systemd-udev mounting in its own namespace