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-00011E-KU 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 705B621C15E; 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 3331921C158 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 A7F441B4068 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 7562680048 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: f23f77e24dfc09caa400f5230fbaaeef9c66d779 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: 48c8bbd64e59a67e5b6c1e44814fb50d commit: f23f77e24dfc09caa400f5230fbaaeef9c66d779 Author: Amadeusz =C5=BBo=C5=82nowski gentoo org> AuthorDate: Wed Aug 10 09:32:53 2011 +0000 Commit: Amadeusz =C5=BBo=C5=82nowski gentoo org> CommitDate: Wed Aug 10 09:32:53 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Df23f77e2 Added GPG support. --- gen_cmdline.sh | 5 +++++ gen_determineargs.sh | 2 ++ gen_dracut.sh | 8 ++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gen_cmdline.sh b/gen_cmdline.sh index 41581ac..9abab0b 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -70,6 +70,7 @@ longusage() { echo " specifying modules by hand" echo " --crypt Include LUKS support" echo " --> 'emerge cryptsetup'" + echo " --gpg Include GPG-armored LUKS key support" echo " --no-ramdisk-modules Don't copy any modules to the ramdisk" echo " --dmraid Include DMRAID support" echo " --dracut-dir=3D Directory of Dracut sources; if given Drac= ut" @@ -383,6 +384,10 @@ parse_cmdline() { CMD_CRYPT=3D1 print_info 2 "CMD_CRYPT: ${CMD_CRYPT}" ;; + --gpg|--crypt-gpg) + CMD_CRYPT_GPG=3D1 + print_info 2 "CMD_CRYPT_GPG: ${CMD_CRYPT_GPG}" + ;; --dmraid) if [ ! -e /usr/include/libdevmapper.h ] then diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 20880c6..37c1847 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -70,6 +70,7 @@ determine_real_args() { =20 set_config_alias MDADM MDRAID set_config_alias LUKS CRYPT + set_config_alias GPG CRYPT_GPG set_config_alias SPLASH GENSPLASH set_config_alias FBSPLASH GENSPLASH =20 @@ -121,6 +122,7 @@ determine_real_args() { set_config_with_override STRING DRACUT_DIR CMD_DRACUT_DIR set_config_with_override BOOL MDRAID CMD_MDRAID 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 set_config_with_override BOOL GENSPLASH CMD_GENSPLASH set_config_with_override STRING ADD_MODULES CMD_ADD_MODULES diff --git a/gen_dracut.sh b/gen_dracut.sh index acc76af..22cea3d 100755 --- a/gen_dracut.sh +++ b/gen_dracut.sh @@ -3,19 +3,19 @@ =20 BASIC_MODULES=3Ddash\ i18n\ kernel-modules\ resume\ rootfs-block\ termin= fo BASIC_MODULES+=3D\ udev-rules\ base -MODULES=3Dlvm\ dmraid\ iscsi\ mdraid\ crypt\ multipath\ plymouth\ genspl= ash +MODULES=3Dlvm\ dmraid\ iscsi\ mdraid\ crypt\ crypt-gpg\ multipath\ plymo= uth\ gensplash =20 dracut_modules() { local a=3D() o=3D() =20 isTrue "${PLYMOUTH}" && isTrue "${GENSPLASH}" && gen_die 'Framebuffer S= plash and Plymouth selected! You cannot choose both splash engines.' - isTrue "${EVMS}" && gen_die 'EVMS is no longer supported. If you *real= ly* need it, file a bug report and we bring it back to life.' isTrue "${UNIONFS}" && gen_die 'UnionFS not yet supported.' =20 for var in ${MODULES} do - var=3D"${var^^}" - isTrue "${!var}" && a+=3D(${var,,}) + opt=3D"${var^^}" + opt=3D"${opt//-/_}" + isTrue "${!opt}" && a+=3D(${var}) done =20 a+=3D(${ADD_MODULES})