From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qr6K5-000117-5D for garchives@archives.gentoo.org; Wed, 10 Aug 2011 10:47:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6292721C158; Wed, 10 Aug 2011 10:47:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3444F21C15C for ; Wed, 10 Aug 2011 10:47:19 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF3861B406E for ; Wed, 10 Aug 2011 10:47:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A0D198004B for ; Wed, 10 Aug 2011 10:47:17 +0000 (UTC) From: "Amadeusz Żołnowski" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amadeusz Żołnowski" Message-ID: Subject: [gentoo-commits] proj/genkernel:dracut commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_cmdline.sh gen_determineargs.sh gen_dracut.sh X-VCS-Directories: / X-VCS-Committer: aidecoe X-VCS-Committer-Name: Amadeusz Żołnowski X-VCS-Revision: f1146f8e6fb34efa6b3d375c926bfa3ce43c88f2 Date: Wed, 10 Aug 2011 10:47:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 35c9761fcd7db6762f29ce666096e480 commit: f1146f8e6fb34efa6b3d375c926bfa3ce43c88f2 Author: Amadeusz =C5=BBo=C5=82nowski gentoo org> AuthorDate: Wed Aug 10 10:45:57 2011 +0000 Commit: Amadeusz =C5=BBo=C5=82nowski gentoo org> CommitDate: Wed Aug 10 10:45:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Df1146f8e --mdadmconf and MDRAID_CONFIG to include or not /etc/mdadm.conf --- gen_cmdline.sh | 4 ++++ gen_determineargs.sh | 2 ++ gen_dracut.sh | 10 ++++++++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/gen_cmdline.sh b/gen_cmdline.sh index 9abab0b..922cc73 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -467,6 +467,10 @@ parse_cmdline() { CMD_MDRAID=3D1 print_info 2 "CMD_MDRAID: ${CMD_MDRAID}" ;; + --mdadmconf) + CMD_MDRAID_CONFIG=3D1 + print_info 2 "CMD_MDRAID_CONFIG: ${CMD_MDRAID_CONFIG}" + ;; --multipath) if [ ! -e /usr/include/libdevmapper.h ] then diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 37c1847..502bd36 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -69,6 +69,7 @@ determine_real_args() { print_info 4 "Resolving config file, command line, and arch default set= tings." =20 set_config_alias MDADM MDRAID + set_config_alias MDADM_CONFIG MDRAID_CONFIG set_config_alias LUKS CRYPT set_config_alias GPG CRYPT_GPG set_config_alias SPLASH GENSPLASH @@ -121,6 +122,7 @@ determine_real_args() { set_config_with_override BOOL GENERIC CMD_GENERIC set_config_with_override STRING DRACUT_DIR CMD_DRACUT_DIR set_config_with_override BOOL MDRAID CMD_MDRAID + set_config_with_override BOOL MDRAID_CONFIG CMD_MDRAID_CONFIG set_config_with_override BOOL CRYPT CMD_CRYPT set_config_with_override BOOL CRYPT_GPG CMD_CRYPT_GPG set_config_with_override BOOL PLYMOUTH CMD_PLYMOUTH diff --git a/gen_dracut.sh b/gen_dracut.sh index 22cea3d..858426e 100755 --- a/gen_dracut.sh +++ b/gen_dracut.sh @@ -5,6 +5,10 @@ BASIC_MODULES=3Ddash\ i18n\ kernel-modules\ resume\ root= fs-block\ terminfo BASIC_MODULES+=3D\ udev-rules\ base MODULES=3Dlvm\ dmraid\ iscsi\ mdraid\ crypt\ crypt-gpg\ multipath\ plymo= uth\ gensplash =20 +strstr() { + [[ $1 =3D~ $2 ]] +} + dracut_modules() { local a=3D() o=3D() =20 @@ -54,6 +58,12 @@ create_initramfs() { opts+=3D" ${EXTRA_OPTIONS}" opts+=3D" $(dracut_modules)" =20 + if strstr "${opts}" " mdraid " + then + isTrue "${MDRAID_CONFIG}" && opts+=3D\ --mdadmconf || \ + opts+=3D\ --nomdadmconf + fi + if isTrue "${GENSPLASH}" then export DRACUT_GENSPLASH_THEME=3D${GENSPLASH_THEME}