From: Tim Yamin <plasmaroo@gentoo.org>
Date: Mon, 7 Mar 2005 00:48:03 +0000 (+0000)
Subject: >> 3.1.1d. Add sata_qstor; fix #83328.
X-Git-Tag: v3.4.10.902~572
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f5660de4617b500dbf35091eeffcab34dc272a4;p=genkernel.git

>> 3.1.1d. Add sata_qstor; fix #83328.


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

diff --git a/generic/linuxrc b/generic/linuxrc
index fea8137..cb74bfc 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -126,6 +126,12 @@ chooseKeymap() {
 	then
 		echo -e "${GOOD}>>${NORMAL}${BOLD} Loading the ''${keymap}'' keymap...${NORMAL}"
 		loadkmap < /lib/keymaps/${keymap}.map
+		xkeymap=${keymap}
+		echo ${keymap} | egrep -e "[0-9]+" >/dev/null 2>&1
+		if [ "$?" -eq '0'  ]; then
+			xkeymap=`tail -n 7 /lib/keymaps/keymapList | grep ${keymap} | sed -r "s/.*\s+${keymap}\s+([a-z-]+).*/\1/g" | egrep -v 1`
+		fi
+		echo "XKEYBOARD=${xkeymap}" > /etc/sysconfig/keyboard
 	elif [ "$keymap" = '' ]
 	then
 		echo -e "${GOOD}>>${NORMAL}${BOLD} Keeping default keymap...${NORMAL}"
@@ -189,6 +195,7 @@ bootstrapCD() {
 		# Not in /dev/cdroms: try /dev/ide/cd
 		[ "${REAL_ROOT}" = '' ] && findcdmount /newroot/dev/ide/cd/*
 		[ "${REAL_ROOT}" = '' ] && findcdmount /newroot/dev/sr0
+		[ "${REAL_ROOT}" = '' ] && findcdmount /newroot/dev/sd* # USB Keychain
 	else
 		# Device specified on command line
 		findcdmount /newroot/${CDROOT_DEV}
diff --git a/genkernel b/genkernel
index 3b41076..6c09d6e 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V='3.1.1c'
+GK_V='3.1.1d'
 TEMP='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.
 
diff --git a/x86/modules_load b/x86/modules_load
index b1a34fc..e376ab0 100644
--- a/x86/modules_load
+++ b/x86/modules_load
@@ -13,4 +13,4 @@ MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_PCMCIA="pcmcia_core yenta_socket i82365 ds ide-cs"
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl811-hcd"
 MODULES_LVM2="dm-mod dm-snapshot dm-mirror"
-MODULES_SATA="sata_promise sata_sil sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vitesse ahci"
+MODULES_SATA="sata_promise sata_sil sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vitesse sata_qstor ahci"
diff --git a/x86_64/modules_load b/x86_64/modules_load
index 285a826..7054112 100644
--- a/x86_64/modules_load
+++ b/x86_64/modules_load
@@ -3,4 +3,4 @@ MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_PCMCIA="ide-cs"
 MODULES_USB="ehci-hcd uhci-hcd ohci-hcd hid usb-storage"
-MODULES_SATA="sata_promise sata_sil sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vitesse ahci"
+MODULES_SATA="sata_promise sata_sil sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vitesse sata_qstor ahci"