sys-kernel/dracut-016: Check kernel config for CONFIG_MODULES.

Added -f option to rm_module function, btw.

Package-Manager: portage-2.1.10.47/cvs/Linux x86_64

3 files changed, 22 insertions, 16 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index df2bfdb187d2..3778b7c2460c 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.47 2012/02/18 14:42:44 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.48 2012/02/21 20:52:30 aidecoe Exp $
+
+  21 Feb 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-016.ebuild:
+  Check kernel config for CONFIG_MODULES. Added -f option to rm_module
+  function, btw.
 
   18 Feb 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-016.ebuild,
   metadata.xml:
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 0b2ad489d1aa..096a7a0b17bf 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -19,17 +19,17 @@ DIST dracut-016.tar.bz2 164830 RMD160 092f9e91316702778b29f0c509071a5c10889ec7 S
 EBUILD dracut-010-r3.ebuild 6049 RMD160 a371a6ceea6d04483540985259d0c843eee24792 SHA1 a778959b6a35d640e93d7e75cef2cc883ae49bd0 SHA256 ce529efea939619500964acfe8d04881b6bab92108e5b6f42386f5a007f1a549
 EBUILD dracut-013-r2.ebuild 6323 RMD160 ea38cc07982bc76d6699e305dfb545a1e753d65c SHA1 c37688d6ba37b9793565e8fb05eb8be679cd69e0 SHA256 13afedce9440e6006e58674e4bfb603a5b915a9a293407509b9a80eb37d3a299
 EBUILD dracut-014-r2.ebuild 6162 RMD160 1ecb3f782193bcfa1cfa585cd831b79ce9e3b81d SHA1 8a83e416f726b854aee919f7a8fd390617f422e4 SHA256 0f611b7befcb3cf1b2fcaba30fa6f2476c202235e43fc08c56c727c5c8b6a69a
-EBUILD dracut-016.ebuild 6829 RMD160 cb7d35b78862d6a8017eb2e00ffc847061e4556c SHA1 56afdc789c52455c3fa568a1261c45aad78ede41 SHA256 0024e8c0c84c97c469f237b205b02dd8650028ec51ade62855c55a4d3e74bf51
-MISC ChangeLog 16019 RMD160 50f09e55582c0243b8866a98a487ea45d91a1a1a SHA1 6681ce9b4e4965407ae171748c65a22beb5d84c3 SHA256 02752d08c26d71a3c15fc79f9bb99a5ff3c2cfb78d42128939d8beec53da00f3
+EBUILD dracut-016.ebuild 6946 RMD160 fc190ef0513b9122054b291ae21dc6871bcf28fe SHA1 cf42c02d3c4607a68a9375269622b7098c5ebbbc SHA256 147fe0f8c67518a14e4b9b8caae8e2fba0f2864ef4d90c1a02b78e83c16f2c4c
+MISC ChangeLog 16184 RMD160 b5f6546d15337eca41c696937115c36d50039765 SHA1 bb04a2f9c38731b62e4c72a2770548d57374a380 SHA256 f27cb3f4565e0aa5e56d4e7564824d2028a8566989590ce2b5d78084c8a3e36d
 MISC metadata.xml 877 RMD160 cf6e2ce3aca26d92e3b0f12b6e01b90fc0c4dd80 SHA1 06e60925a137d8794d6e2351bcc0541b0c105435 SHA256 ad5b9dc7d097e501d72f7f509eed03ff28473066b1f9234b91b99b9a47c9b4f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPP7jpAAoJEPATRTHh2/q1BQAIAIVO52ieIKHJEp9/0FIL76sa
-7xlUIRcmd0bB6QOJL62Ao8GRnYJsurZmookqJte8TLyOo8+2XSaKZWhKGEj9pM1j
-2wFIKg7AmQ+OsYRoic3S9PXTpdjuyaQjwtZ9npHREPFXPrVXLhOXwbfVIIeqbRCC
-AatMfecngELyTUZe/NbG1Gv1cXJXaLs4uRZ1kNynpqpeL3Rfb4gofIie3cmZ7arR
-495srSH1rrI59BmdtX7xN+JKngdH0YZ5uXc9t/XPyg/9u3cgD/D08xRCC0zO2kKY
-/xvi09SRfqSAZon7/WvSIzLDvvJbHna5G0cITDWFIrVEcs2w5ioT7nlvIUSy/0Y=
-=lC7z
+iQEcBAEBAgAGBQJPRAQUAAoJEPATRTHh2/q1tCEIAKF1lMaoOKmVeTX16dukYuwd
+4QXfp6HDPKfk2So6jl3m/7EEGIWcIg64AQtpMWza5EfRB7HLn5IGa2mzhByPOYrs
+jz7cNSqdRN9gUfLpwjZIp170RT/Ky8Y36udmtdbSdjGSoPnByaaYNRnUpy2mjvBU
+PaAy8s/EXviBVnJnbFeVmr4fFqkNu3bVUvQoLXGJJFPul+5AsIYkrN7g5ez3SiBE
+SZSbUojYVDGDCxwgNfJjhQ3tS1KQfh1jDrm+vxIZmJ11zIEI4W8NEtX4wPwRB2/s
+WmhNath7YtMH8/EtJq6ERk7KN01bww7Dtl5FuyMfbJWcZxCiq97MpEktQuAtbag=
+=I/S1
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-016.ebuild b/sys-kernel/dracut/dracut-016.ebuild
index ae4784844943..19c8cf1cd657 100644
--- a/sys-kernel/dracut/dracut-016.ebuild
+++ b/sys-kernel/dracut/dracut-016.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-016.ebuild,v 1.4 2012/02/18 14:42:44 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-016.ebuild,v 1.5 2012/02/21 20:52:30 aidecoe Exp $
 
 EAPI=4
 
@@ -120,13 +120,14 @@ any_module() {
 # $1 = module name
 # Module name can be specified without number prefix.
 rm_module() {
-	local m
+	local force m
+	[[ $1 = -f ]] && force=-f
 
 	for m in $@; do
 		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm --interactive=never -r "${modules_dir}"/$m
+			rm ${force} --interactive=never -r "${modules_dir}"/$m
 		else
-			rm --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
+			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
 		fi
 	done
 }
@@ -185,7 +186,7 @@ src_install() {
 
 	# Remove modules not enabled by USE flags
 	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module ${module#dracut_modules_}
+		! use ${module} && rm_module -f ${module#dracut_modules_}
 	done
 
 	# Those flags are specific, and even are corresponding to modules, they need
@@ -218,12 +219,13 @@ pkg_postinst() {
 		ewarn "kernel before booting image generated with this Dracut version."
 		echo
 
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS ~MODULES"
 
 		# Kernel configuration options descriptions:
 		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
 		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
 "(initramfs/initrd) support"
+		local desc_MODULES="Enable loadable module support"
 
 		local opt desc