split dracut in network / non-network

diff --git a/dracut.spec b/dracut.spec
index 0a28c7382063ee90a7ab4b3f813717128a828a06..b4cc0f9016ca3265cd9dd921126e108e801328ad 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -40,7 +40,6 @@ Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.63-1
 Requires: e2fsprogs >= 1.38-12, libselinux, libsepol, coreutils
 Requires: mdadm, elfutils-libelf, plymouth >= 0.7.0
 Requires: cryptsetup-luks
-Requires: bridge-utils
 Requires: file
 Requires: bzip2
 Requires: policycoreutils
@@ -55,20 +54,29 @@ BuildArch: noarch
 %description
 dracut is a new, event-driven initramfs infrastructure based around udev.
 
-%package generic
-Summary: Metapackage to build a generic initramfs with dracut
+%package network
+Summary: dracut modules to build a dracut initramfs with network support
 Requires: %{name} = %{version}-%{release}
 Requires: rpcbind nfs-utils 
 Requires: iscsi-initiator-utils
 Requires: nbd
 Requires: net-tools iproute
-Requires: plymouth-system-theme plymouth-theme-charge plymouth-theme-solar
-Requires: plymouth-theme-fade-in plymouth-theme-spinfinity
+Requires: bridge-utils
+
+%description network
+This package requires everything which is needed to build a generic
+all purpose initramfs with network support with dracut.
+
+%package generic
+Summary: Metapackage to build a generic initramfs with dracut
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-network = %{version}-%{release}
 
 %description generic
 This package requires everything which is needed to build a generic
 all purpose initramfs with dracut.
 
+
 %package kernel
 Summary: Metapackage to build generic initramfs with dracut with only kernel modules
 Requires: %{name} = %{version}-%{release}
@@ -101,7 +109,8 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin sysconfdir=/etc mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin \
+     sysconfdir=/etc mandir=%{_mandir}
 
 %if ! 0%{?with_switch_root}
 rm -f $RPM_BUILD_ROOT/sbin/switch_root
@@ -122,18 +131,44 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %dir %{_datadir}/dracut
 %{_datadir}/dracut/dracut-functions
-%{_datadir}/dracut/modules.d
 %config(noreplace) /etc/dracut.conf
 %{_mandir}/man8/dracut.8*
-
-%files generic
+%{_datadir}/dracut/modules.d/00dash
+%{_datadir}/dracut/modules.d/10redhat-i18n
+%{_datadir}/dracut/modules.d/10rpmversion
+%{_datadir}/dracut/modules.d/50plymouth
+%{_datadir}/dracut/modules.d/90crypt
+%{_datadir}/dracut/modules.d/90dmraid
+%{_datadir}/dracut/modules.d/90dmsquash-live
+%{_datadir}/dracut/modules.d/90kernel-modules
+%{_datadir}/dracut/modules.d/90lvm
+%{_datadir}/dracut/modules.d/90mdraid
+%{_datadir}/dracut/modules.d/95debug
+%{_datadir}/dracut/modules.d/95resume
+%{_datadir}/dracut/modules.d/95rootfs-block
+%{_datadir}/dracut/modules.d/95s390
+%{_datadir}/dracut/modules.d/95terminfo
+%{_datadir}/dracut/modules.d/95udev-rules
+%{_datadir}/dracut/modules.d/95udev-rules.ub810
+%{_datadir}/dracut/modules.d/98syslog
+%{_datadir}/dracut/modules.d/99base
+
+%files network
 %defattr(-,root,root,0755)
-%doc README.generic
+%{_datadir}/dracut/modules.d/40network
+%{_datadir}/dracut/modules.d/95fcoe
+%{_datadir}/dracut/modules.d/95iscsi
+%{_datadir}/dracut/modules.d/95nbd
+%{_datadir}/dracut/modules.d/95nfs
 
 %files kernel 
 %defattr(-,root,root,0755)
 %doc README.kernel
 
+%files generic
+%defattr(-,root,root,0755)
+%doc README.generic
+
 %files tools 
 %defattr(-,root,root,0755)
 %doc COPYING NEWS

diff --git a/modules.d/90dmraid/check b/modules.d/90dmraid/check
index 4dd9d7a3ad8c5073341c64b51ec5ccad7f907bb0..eacec6053770a598023ff2104baa8b53da71ca13 100755 (executable)
--- a/modules.d/90dmraid/check
+++ b/modules.d/90dmraid/check
@@ -5,6 +5,7 @@
 which dmraid >/dev/null 2>&1 || exit 1
 
 . $dracutfunctions
+[[ $debug ]] && set -x
 
 is_dmraid() { get_fs_type /dev/block/$1 |grep -v linux_raid_member | \
     grep -q _raid_member; }

diff --git a/modules.d/90lvm/check b/modules.d/90lvm/check
index e57d60f04cf2d13c5dfff1ce37682035346ad314..25f24e23ed4a7d579f99461d2b328288fa94e327 100755 (executable)
--- a/modules.d/90lvm/check
+++ b/modules.d/90lvm/check
@@ -4,6 +4,7 @@
 which lvm >/dev/null 2>&1 || exit 1
 
 . $dracutfunctions
+[[ $debug ]] && set -x
 
 is_lvm() { [[ $(get_fs_type /dev/block/$1) = LVM2_member ]]; }
 

diff --git a/modules.d/90mdraid/check b/modules.d/90mdraid/check
index 5bffd36a1fb81e612f23c28aec22a5f3df3b0453..be200e11de432b1d176bcfc85721ec049ca0b60a 100755 (executable)
--- a/modules.d/90mdraid/check
+++ b/modules.d/90mdraid/check
@@ -4,6 +4,7 @@
 which mdadm >/dev/null 2>&1 || exit 1
 
 . $dracutfunctions
+[[ $debug ]] && set -x
 
 is_mdraid() { get_fs_type /dev/block/$1 |egrep -q '(linux|isw)_raid'; }