[gentoo-commits] proj/genkernel:dracut commit in: /

["Amadeusz Żołnowski" <aidecoe@gentoo.org>]

commit:     f23f77e24dfc09caa400f5230fbaaeef9c66d779
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 09:32:53 2011 +0000
Commit:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 09:32:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=f23f77e2

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=<dir>	Directory of Dracut sources; if given Dracut"
@@ -383,6 +384,10 @@ parse_cmdline() {
 			CMD_CRYPT=1
 			print_info 2 "CMD_CRYPT: ${CMD_CRYPT}"
 			;;
+	    --gpg|--crypt-gpg)
+	        CMD_CRYPT_GPG=1
+	        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() {
 
 	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
 
@@ -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 @@
 
 BASIC_MODULES=dash\ i18n\ kernel-modules\ resume\ rootfs-block\ terminfo
 BASIC_MODULES+=\ udev-rules\ base
-MODULES=lvm\ dmraid\ iscsi\ mdraid\ crypt\ multipath\ plymouth\ gensplash
+MODULES=lvm\ dmraid\ iscsi\ mdraid\ crypt\ crypt-gpg\ multipath\ plymouth\ gensplash
 
 dracut_modules() {
 	local a=() o=()
 
 	isTrue "${PLYMOUTH}" && isTrue "${GENSPLASH}" && gen_die 'Framebuffer Splash and Plymouth selected!  You cannot choose both splash engines.'
-	isTrue "${EVMS}" && gen_die 'EVMS is no longer supported.  If you *really* need it, file a bug report and we bring it back to life.'
 	isTrue "${UNIONFS}" && gen_die 'UnionFS not yet supported.'
 
 	for var in ${MODULES}
 	do
-		var="${var^^}"
-		isTrue "${!var}" && a+=(${var,,})
+		opt="${var^^}"
+        opt="${opt//-/_}"
+		isTrue "${!opt}" && a+=(${var})
 	done
 
 	a+=(${ADD_MODULES})