diff options
| author |   Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2012-02-21 20:52:30 +0000 |
|---|---|---|
| committer | Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2012-02-21 20:52:30 +0000 |
| commit | f8b1cdcba50d5148f43d93471199deca1bc68b6f (patch) | |
| tree | 16cefbf097eb1b2f18a1a7d2fa029f0bd200f3c6 /sys-kernel | |
| parent | Version bump to 0.6.1 and rename from ultrastar-ng to performous. Bug #245452 (diff) | |
| download | gentoo-2-f8b1cdcba50d5148f43d93471199deca1bc68b6f.tar.gz gentoo-2-f8b1cdcba50d5148f43d93471199deca1bc68b6f.tar.bz2 gentoo-2-f8b1cdcba50d5148f43d93471199deca1bc68b6f.zip | |
sys-kernel/dracut-016: Check kernel config for CONFIG_MODULES.
Added -f option to rm_module function, btw.
(Portage version: 2.1.10.47/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/dracut/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-kernel/dracut/dracut-016.ebuild | 14 |
2 files changed, 13 insertions, 7 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/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 |