From: Tim Yamin <plasmaroo@gentoo.org>
Date: Mon, 15 Aug 2005 20:33:52 +0000 (+0000)
Subject: Fix #102407.
X-Git-Tag: v3.4.10.902~446
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bc7f6928920e1a0f99c6bbaed00d856355b7d722;p=genkernel.git

Fix #102407.


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@306 67a159dc-881f-0410-a524-ba9dfbe2cb84
---

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index d328970..9d4bdf4 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -202,11 +202,17 @@ parse_cmdline() {
 		      CMD_NO_BUSYBOX=1
 		      print_info 2 "CMD_NO_BUSYBOX: $CMD_NO_BUSYBOX"
 	      ;;
-		  --bladecenter)
+	      --bladecenter)
 		      CMD_BLADECENTER=1
-			  print_info 2 "CMD_BLADECENTER: $CMD_BLADECENTER"
-		  ;;
+		      print_info 2 "CMD_BLADECENTER: $CMD_BLADECENTER"
+	      ;;
 	      --dmraid)
+		      if [ ! -e /usr/include/libdevmapper.h ]
+		      then
+			echo 'Error: --dmraid requires device-mapper to be installed'
+			echo '       on the host system; try "emerge device-mapper".'
+			exit 1
+		      fi
 		      CMD_DMRAID=1
 		      print_info 2 "CMD_DMRAID: $CMD_DMRAID"
 	      ;;
@@ -225,9 +231,9 @@ parse_cmdline() {
 
 		      if [[ TERM_LINES -lt 19 || TERM_COLUMNS -lt 80 ]]
 		      then
-			      echo "Error: You need a terminal with at least 80 columns"
-			      echo "       and 19 lines for --menuconfig; try --nomenuconfig..."
-			      exit 1
+			echo "Error: You need a terminal with at least 80 columns"
+			echo "       and 19 lines for --menuconfig; try --nomenuconfig..."
+			exit 1
 		      fi
 		      CMD_MENUCONFIG=1
 		      print_info 2 "CMD_MENUCONFIG: $CMD_MENUCONFIG"