9 files changed, 94 insertions, 115 deletions

diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index d146b2ab45..73d0cfe87f 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -6,14 +6,15 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 IGNORE_STRIP_ERRORS = "1"
 
-PR = "r35"
+PR = "r37"
 
 
 SRC_URI = "file://altboot-menu \
 	   file://altboot.rc \
 	   file://altboot.func \	 
 	   file://init.altboot \
-	   file://altboot*.cfg"
+	   file://altboot*.cfg \
+	   file://beep.raw"
 
 # S = "${WORKDIR}/files"
  
@@ -23,7 +24,9 @@ do_install() {
 	install -d ${D}/etc/altboot-menu/Advanced
 	install -d ${D}/etc/altboot.rc
 	install -d ${D}/usr/share/doc/altboot
+	install -d ${D}/usr/share/sounds
 	
+	install -m 0644 ${WORKDIR}/beep.raw ${D}/usr/share/sounds
 	install -m 0644 ${WORKDIR}/altboot*.cfg ${D}/etc
 	install -m 0644 ${WORKDIR}/altboot.func ${D}/etc
 #	install -m 0644 ${WORKDIR}/docs/altboot/*.txt ${D}/usr/share/doc/altboot
diff --git a/packages/altboot/altboot_1.0.6-rc2.bb b/packages/altboot/altboot_1.0.6-rc2.bb
deleted file mode 100644
index bb99fe31e5..0000000000
--- a/packages/altboot/altboot_1.0.6-rc2.bb
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: altboot_1.0.5-rc2.bb
-# Date: 21-Feb-06
-
-DESCRIPTION = "The altboot bootmanager"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-######################################################################################
-
-PR = "r0"
-
-######################################################################################
-
-PACKAGE_ARCH = "${MACHINE}"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
-
-SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot"
-
-S = "${WORKDIR}/altboot/"
-
-######################################################################################
-
-do_install() {
-	install -d ${D}/sbin
-	install -d ${D}/etc/altboot-menu
-	install -d ${D}/etc/altboot-menu/Advanced
-	install -d ${D}/etc/altboot.rc
-	install -d ${D}/usr/share/doc/altboot
-	
-	if test -d ${WORKDIR}/altboot/${MACHINE}
-	then
-		install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc
-	else
-		install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc
-	fi
-	
-	install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc
-	install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin
-	
-	if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/	
-	then
-		install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
-	else
-		install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu
-	fi
-
-	if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/
-	then
-		install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-	else
-		install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-	fi
-	
-	install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc
-	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc	
-}		
-
-######################################################################################
-
-do_configure() {
-	cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${WORKDIR}/altboot/init.altboot_
-	mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot
-}
-
-######################################################################################
-
-pkg_postinst() {
-	update-alternatives --install /sbin/init init /sbin/init.altboot 55
-}
-
-######################################################################################
-
-pkg_postrm() {
-	update-alternatives --remove init /sbin/init.altboot
-}
-
diff --git a/packages/altboot/altboot_1.0.6-rc1.bb b/packages/altboot/altboot_1.0.6-rc3.bb
index bb99fe31e5..c13b346fc3 100644
--- a/packages/altboot/altboot_1.0.6-rc1.bb
+++ b/packages/altboot/altboot_1.0.6-rc3.bb
@@ -32,6 +32,7 @@ do_install() {
 	install -d ${D}/etc/altboot-menu/Advanced
 	install -d ${D}/etc/altboot.rc
 	install -d ${D}/usr/share/doc/altboot
+	install -d ${D}/usr/share/sounds
 	
 	if test -d ${WORKDIR}/altboot/${MACHINE}
 	then
@@ -39,7 +40,8 @@ do_install() {
 	else
 		install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc
 	fi
-	
+
+	install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds
 	install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc
 	install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin
 	
diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
index e81526d251..c3fb7cedc4 100644
--- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
+++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
@@ -7,7 +7,7 @@
 M_TITLE="Boot from NFS"
 
 die() {
-	echo "ERROR: $1" >/dev/tty0
+	echo -e "ERROR: $1" >/dev/tty0
 	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
 }
 
@@ -37,6 +37,8 @@ run_module() {
 	else	
 		# With kernel 2.6.16+ udev is used 
 		/etc/init.d/udev start >/dev/null 2>&1 || die "/etc/init.d/udev start failed!"
+		
+		/etc/init.d/udev stop
 	fi
 	
 	nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `"
diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz
index cdfa052747..2ee92cd27e 100644
--- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz
+++ b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz
@@ -14,7 +14,7 @@ run_module(){
 	init_rootfs
 	
 	# Mount
-	mount_sd	
+	mount_sd ingore_errors	
 	mount_cf
 	mount_home
 	
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 0cc59116ce..31704e4029 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -372,14 +372,16 @@ verify_master_pw() {
 	then
 		auth_timeout="3"
 
-		echo "Please enter your altboot master password"
+		echo -e "\nPlease enter your altboot master password"
 
 		cnt=0
 		while true
 		do
 			let cnt=$cnt+$auth_timeout
 			echo -n "Password: "
+			stty -echo
 			read junk < /dev/tty0
+			stty echo
 
 			if test "`echo "$junk" | md5sum | awk '{print $1}'`" = "$MASTER_PASSWORD"
 			then
@@ -396,6 +398,8 @@ verify_master_pw() {
 #				fi
 			fi
 		done
+		
+		echo ""
 	fi
 }
 
@@ -439,8 +443,8 @@ check_fs() {
 
 # Make the initial rootfs a bit more usable
 init_rootfs(){
-	echo -n "Mounting rootfs rw..." >/dev/tty0
-	mount -o remount,rw / >/dev/tty0 2>&1 && echo ok  >/dev/tty0|| die "mount -o remount,rw / failed"
+	echo -n "Mounting rootfs rw..." 
+	mount -o remount,rw / && echo ok || die "mount -o remount,rw / failed"
 
 	mount | grep -q "/proc " >/dev/null 2>&1 && echo "Note: /proc is already mounted" || mount proc -t proc /proc >/dev/tty0 2>&1
 	
@@ -449,8 +453,8 @@ init_rootfs(){
 		mount | grep -q "/sys " >/dev/null 2>&1 && echo "Note: /sys is already mounted" || mount sys -t sysfs /sys >/dev/tty0 2>&1
 	fi
 	
-	echo -n "Generating device files..." >/dev/tty0
-	/etc/init.d/devices start && echo ok  >/dev/tty0 || die "FAILED"
+	echo -n "Generating device files..." 
+	/etc/init.d/devices start && echo ok || die "FAILED"
 }
 
 mount_sd(){
@@ -474,14 +478,18 @@ mount_sd(){
 		then
 			echo -n "Loading SD kernel module..."
 			/sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed"
-		else
-			echo "No SD kernel module configured, assuming it's build-in"
 		fi
 		
 		check_fs "$SD_DEVICE"
 
 		echo -n "Mounting $SD_MOUNTPOINT..."  >/dev/tty0
-		/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok  >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed"
+		
+		if test "$1" = ingore_errors
+		then
+			/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok  >/dev/tty0 || echo "Could not mount SD card"
+		else
+			/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok  >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed"
+		fi		
 	fi
 	echo ""	
 	
@@ -494,14 +502,26 @@ mount_cf(){
 	then
 		echo "Note: /media/cf is already mounted"
 	else	
-		/etc/init.d/pcmcia status | grep -q running || /etc/init.d/pcmcia start && echo "Note: cardmgr is already active"
+		if ( cat /etc/fstab | grep -v "^#" | grep -q "/media/cf" )
+		then
+			# As of kernel 2.6.16, /e/i/pcmcia is replaced by udev
+			if test -x /etc/init.d/pcmcia
+			then
+				/etc/init.d/pcmcia status | grep -q running || /etc/init.d/pcmcia start && echo "Note: cardmgr is already active"
+			else
+				for n in 1 2 3
+				do
+					! test -e "/dev/hda$n" && mknod /dev/hda$n b 3 $n
+				done
+			fi			
 
-		echo ""
+			# Give the SD and CF mounting some time. This is a must for SD			
+			sleep 2
 
-		# Give the SD and CF mounting some time. This is a must for SD			
-		sleep 2
-		
-		mount | grep -q "/media/cf " || mount /media/cf
+			mount /media/cf -o async
+		else
+			echo "Note: Your system's fstab does not include an entry for /media/cf"
+		fi
 	fi
 }
 
@@ -511,7 +531,7 @@ mount_home(){
 		echo "Note: /home is already mounted"
 	else
 
-		if ( cat /etc/fstab | grep -v "^#" | grep "/home " )
+		if ( cat /etc/fstab | grep -v "^#" | grep -q "/home " )
 		then
 			echo "Mounting /home"
 			home_fstab="`grep "/home " /etc/fstab`"
@@ -520,6 +540,8 @@ mount_home(){
 			home_options="`echo "$home_fstab" | awk '{print $4}'`"
 
 			mount -t "$home_fs" -o $home_options "$home_dev" /home
-		fi	
+		else
+			echo "Note: Your system's fstab does not include an entry for /home"
+		fi
 	fi
 }
diff --git a/packages/altboot/files/altboot.rc/playbeep.sh b/packages/altboot/files/altboot.rc/playbeep.sh
new file mode 100644
index 0000000000..198a87429f
--- /dev/null
+++ b/packages/altboot/files/altboot.rc/playbeep.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: playbeep.sh
+# Date: 12-Apr-06
+
+if test -x /usr/sbin/alsactl
+then
+	for module in `cat /etc/modules | grep snd | grep -v ^#`
+	do
+		#echo "loading $module"
+		modprobe $module
+	done
+
+	mount -o remount,rw /
+	
+	init_rootfs >/dev/null 2>&1
+
+	! test -e /dev/audio && mknod /dev/audio c 14 4
+	! test -e /dev/dsp && mknod /dev/dsp c 14 3
+		
+	mkdir /dev/snd >/dev/null 2>&1
+	mknod /dev/snd/controlC0 c 116 0 >/dev/null 2>&1
+	mknod /dev/snd/pcmC0D0c c 116 24 >/dev/null 2>&1
+	mknod /dev/snd/pcmC0D0p c 116 16 >/dev/null 2>&1
+	mknod /dev/snd/timer c 116 33 >/dev/null 2>&1
+	/usr/sbin/alsactl restore >/dev/null 2>&1
+	
+	test -e /usr/share/sounds/beep.raw && cat /usr/share/sounds/beep.raw > /dev/dsp  
+fi
diff --git a/packages/altboot/files/beep.raw b/packages/altboot/files/beep.raw
new file mode 100644
index 0000000000..f76112185c
--- /dev/null
+++ b/packages/altboot/files/beep.raw
@@ -0,0 +1 @@
+€~€~~~~€~€~€~€~~€~€~€~€~€~~€€~v…ok›”[lฉ‘SpฏŒMxณ‚L‚ณxMฐnS’ชlT”ฎgOžฐZQซฉO\ดœHjธŽFxธ€H…ตuMฐmR–ซgVšจdXœฆaZŸค^[ฃคZ\งขU^ญ Obณ›Jgท”FoปŒCxผƒC€ป{EˆธtIŽดnM”ฏiR—ชfX›ฅb]žŸ_bขš\hฅ”XoจVvช…T~ซ~T…ซvUŒฉoX’ฅj\—กg`šœde›—cjœ’božŽasŸ‰_xก…]|ข€\‚ค{Z‡ฅuYฅpZ’คk[–ขg^šŸcb›afŸ—_jก“^oขŽ]tฃ‰[yคƒ[ค~[„คx\Šฃr] l`•hc™™dh•al ^qข‹]wฃ†\|ฃ€\ฃ{\†ฃv]Œกq_‘Ÿla•œgeš™chž•`mก]rฃ‹[wค†Z|ฅ€Zฅ{[‡คv\Œขq^Ÿma”œid˜™fhš•dlœbqžŒavŸ‡`{Ÿ‚a€}c…›xe‰™ugŒ—ri•oj’•kk–”flœ’`oขŽZtงˆW{ชUชzV‡จuXŒฆqZฃm]“ j`–gcššcg•amŸ_rกŠ^xข…]|ข€]ข|]…กx^Šกs_ŽŸoa’kd–™hh˜•fk™’eo›Žcr‹awŸ†_| €_‚ z`‡žvcŠšvhˆ“yq…Š|y‚‚€~ƒ~|ƒ~}€‚€~~‚~|‚„}{‚„}|‚ƒ}}~€}‚}€‚}€~~‚~|ƒ}|‚‚}~€~€€~€‚}€‚}€€~€€~~‚‚||„ƒz|…ƒz|„ƒ||‚„~z‡}w…‡ty’ƒeก{Y‰งpY”ฃfa˜_mก\wค„Z~ฆWƒฉzUˆชtUŽฉnW”ฆg[›ขa` œ]fค–ZmฆYsฆŠYwฆ…X|งWจ|W…จxW‰งtYŒฆpZ‘ฅj\˜ขc` œ\gฅ”YnงXuฆˆZyฅ„Z|ฅ€Zฅ|[…ฃx\‰ขu^Œกr^ m_•Ÿga›œbe —]kฃ’[pฅŒZuฆ‡Y{ฆ‚Y€ฆ|Y†ฅw[‹ฃr]กm_”žib™›efœ—akŸ’^oข]tฃˆ[yคƒ[~ค[ƒฃz\ˆขu^Œกq`‘žlb•›hf˜˜eiœ”bnž`r ‹^wข†]|ฃ\ฃ{\†ขv]‹กr_Ÿma”œhd™™ehœ•am ^rข‹\wค…Z}ฅ€Y‚ฆzZˆฅu[ฃp]’กk_–žgcššdg–alŸ‘_qก‹^vข†]{ข]ข|^…กw_Š s`Žžpb‘œme”™jh–•hk˜’fpšet›‰cx…b|€až|a…žxb‰tcœpd‘šlf”˜ii—•flš‘doœbtž‰axž…`}ž€až|b…œxcˆ›ue‹™rf˜nh’•jk—’fo›buž‡a{ž‚a~b‚{b†wcŠ›te™qh–nk’“mm“‘lo”jq–hu—‰lx…u{…ƒ~}…x€ˆw‡~z„~}‚€€€€€€|„z…~{„|€ƒ|ƒ~}‚}~‚~}ƒ}{‚…|zƒ„|{ƒƒ}|‚ƒ}|‚ƒ|{„„{{…„z|…‚{~ƒ}}‚‚~|ƒ~}€‚€}~ƒ€{‚…vy‘†exก†YzฉƒT~ซ}T…ชvVงnZ”ขh_™žcdž˜_iข“\nฅYsจŠVwช…T|ญ€Q‚ฐzN‰ฑqN“ฏgRœซ_WฃฅZ]งŸWcช™Uiซ’TpซŒTvช…U}ฉV‚จzXˆฆtZฃp]‘กl`•hc˜šeg›–ck’aoŸŽ`s ‰_xก…^}ก€_‚ {_‡ v`ŒŸqamc”›ie—˜fi›”cmž`r ‹^wข†]|ฃ\ฃ{\‡ฃv]Œกq_Ÿla•œhd™™dhœ•alŸ_qก‹]vฃ†\{ค[€ค|[…ฃw\Šขs^ n`“žjc—šffš—cj“`o Ž^sขŠ]xฃ…\}ฃ€\‚ฃ{]†ขv^‹ r`žnc“›jf——giš“dnœbržŠ`wŸ†_| _€ |`…Ÿxa‰žtbœpd‘™lg•–hj˜“fn›cqŒbvž‡azŸƒ`Ÿ~`„Ÿx`Šžsbnd“šjf—˜ghš•dkœ’bnž`r ‹^vก†^{ก‚^ ~`ƒžzc‡›ve‹˜rh–nk““in˜dqœŒau ˆ^yก„^}ก€^ |_…Ÿx`‰Ÿsažnb”œheš™chž•`l ‘_qกŒ^uกˆ^yข…]}ฃ€[‚คz[ˆคt\กm`”œif–•jn“ŒoxŒƒv€†||…y€‡~y†~z„}‚~~‚~}‚}~ƒ{„{„~{‚ƒ||ƒ‚|~ƒ€{€„{„~{„}{‚„}|ƒƒ|}ƒ{€„|ƒ}}‚‚}}‚~~~~‚~~~€€~‚{~‡v„Œuo”hfœ^bฅVdฌ—QlฏŽPuฏ…P}ฎ~R„ฌwT‹ชqV‘จkX—ฅe\œก`a ›]gฃ–\lค[rฅ‹Ywง†X|จ€V‚ฉzVˆจtWฆoZ“ฃj]˜ eaœ_eฃ—YkจTsญ‡P|ฐ~O…ฐvPŒฎrRซpUฉnW‘จlW”จiX˜ฆe[ก`aก›\hฅ“Ypฆ‹Xwง…X}ฆYƒฅyZˆคt\ขp^’ ka–œhe™™ehœ•bmž`q Œ^uข‡]zข‚]ข~]„ขy^ˆกt_Ÿpa‘lc•›hf™—djœ“anŸ_rกŠ^wข†]|ข]ข|]†กw_ŠŸranc“šjg——gjš“dnœbsžŠ`wŸ…_| €_ |`†Ÿwa‹žrbœne“™jg—–fkš“cnarŸŠ_w †^{ก‚^€ก}^… x_‰ŸsaŽžoc’›ke•™hh˜•el›‘cpbužˆazŸƒ`~Ÿ~`ƒžyaˆucŒ›pe‘™mg”–ik—“fnšdrœ‹bwž†a{Ÿ`€Ÿ}`…Ÿxa‰žtbpc‘›ld•™if——fiš•dk’aoŸŽ_sกŠ]xข„]~ข}_…žxc‰šug‹–sj”ql’on‘mq“ks”‹ju–‰hw˜‡fz™ƒh”}p„Šz{…€zƒ…y{ˆ„u{‹ƒu|Š‚w~‡z~…{~„€{€ƒ|€ƒ|€ƒ|€‚~}‚~}‚}}ƒ‚|~„€{€ƒ~}€}€‚}€‚~}~~€€~‚€|„{€„{€„~{ƒ~|‚„}z‚†}xƒˆ|w„ˆ{w„Šzp†–xcˆขuZŒฆqY‘ฅk\—กdaœ_fข–\lค‘ZqฆŒXuจ‡WzจƒW~จVƒฉyV‰จrXฆkZ˜ฃd_Ÿ]eฅ–XmจVsฉ‰UyซƒT~ซ~TƒชyVˆจtXฆp[’ฃk^–Ÿgbš›cf—`k ’^oข\tฃˆ[zคƒ[ค}\„ฃx]‰ขs^Ž n`“jc—›ff›—cjž“`n ^rข‹\wค†[|ฅZ€ฅ|Z…ฅx[‰คs\Žขo^’Ÿka–œgdš™dh•alŸ‘_pกŒ^uข‡]zข‚]ข}]„กx^‰ t`Žžoc’›kf–˜giš”dmœaqŸ‹_v †^{ก]€ข}]…กx^Š s_Žžnb“œjd—™ghš•cl‘apŸ_tกˆ^yก„]~ข^‚กz_‡ v`‹žrbœne“™kh––gk™’eo›ŽbsžŠawŸ…`| _€Ÿ|`…Ÿxa‰žtbœpd‘šlg•—ik—’go™Žfs™‹fv™‡eyš„e}›d‚›ze‡™ugŒ–rj“om‘‘mn“jo–gqšŒcu‡azžƒ`ž~a‚{b…xbˆœucŒ›qe™mh”•im˜frš‹cw†a|ž€až{a†vb‹œqd›me•šhfš˜ciž“_oก_wžƒe€–{nˆŒuxŒ„sŒu‚‰~x†€z~…‚{|„„|zƒ…|zƒ†|yƒ†|y„†{y……z{„ƒ{}ƒ€}€€~€}~ƒ{~„{~„{}„‚{|„ƒ{{„„{z……yz‡„w{‰ƒu}Š€u€Š~w‚‡}{‚‚~~ƒ‚y}ˆv‚‹wrimœ•^jฆ”VnฌRwฏ‚PƒฏvQฌkV™ฆb\ŸŸ]cค˜Yiจ“VoซŽSsญŠQwฏ…O}ฐNƒฑyO‰ฏsQญlT•ฉgXšฅd]œ abŸš_hก”]nฃŽZtฆˆXzง‚Wจ~WƒจzX‡ฆwZŠคt]กp_‘žlc–šgg›–bl ]rค‰YyงƒX€จ|W†งwYŠฅs[Žฃp^ n`“žkb•œhd™šef˜ai •]lค‘ZpฆXuงˆXzง‚Y€ฅ|[…ขw^‹Ÿramd“™jg—–fkš’což`tกˆ\zค‚Y€ง|X†งvX‹ฆq[ขm_“ke“˜nkrtŠ‡x}…~|…‚x~‰€u€Šu€‰w€‡z€„|€‚}‚~}‚}}‚‚}}‚‚}}~~~€€€€~€~€~€~€~€~€€~€~€~€~€~€~€~€~€~€€~€~€~€~€~€~~€~€~€~€~~~~€~€€€€€€€€~€~€~€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€
\ No newline at end of file
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 22f3e86e83..cf3a1f8262 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -151,16 +151,17 @@ show_sub_menu() {
 # Shows the timer and sets $launch_altboot to yes if a keypress was detected
 run_timer() {
 	if test "$TIMEOUT" != 0
-	then
+	then			
 			
 		mount -t proc proc /proc >/dev/null 2>&1
 		
 		case "`uname -r`" in
 		2.4*)	key_ints="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`";;
-		2.6*)	key_ints="`cat /proc/interrupts | grep Spitzkbd`";;	
+		2.6*)	key_ints="`cat /proc/interrupts | grep Spitzkbd`"
+			test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i corgikbd`";;	
 		esac		
 	
-		stty -echo
+		stty -echo  </dev/tty0 >/dev/tty0 2>&1
 		echo -en "\n\nPlease press any key to launch altboot." > /dev/tty1
 		
 		test -z "$TIMEOUT" && TIMEOUT="3"
@@ -171,13 +172,14 @@ run_timer() {
 			sleep 1
 			case "`uname -r`" in
 			2.4*)	key_ints_now="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`";;
-			2.6*)	key_ints_now="`cat /proc/interrupts | grep Spitzkbd`";;	
+			2.6*)	key_ints_now="`cat /proc/interrupts | grep Spitzkbd`"
+				test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i corgikbd`";;	
 			esac		
 			
-			if test "$key_ints_now" != "$key_ints" 
+			if test "$key_ints_now" != "$key_ints" -o -z "$key_ints_now"
 			then				
 				launch_altboot=yes				
-				stty echo
+				stty echo </dev/tty0 >/dev/tty0 2>&1
 				break
 			fi
 			echo -n "." >/dev/tty1
@@ -309,21 +311,18 @@ else
 	do
 		 . /etc/altboot.rc/$file >/dev/tty1 2>&1 || echo "/etc/altboot.rc/$file failed!"
 	done
-		
+			
 	# Make sure altboots master password is set
 	set_password >/dev/tty0 
 	
 	test "$ASK_PW_ON_BOOT" = "yes" && verify_master_pw >/dev/tty0 
 
-
 	# When started with -force, always print the menu
 	echo "$*" | grep -q -- "-force" && TIMEOUT=0
-
 	
 	# This timeout works by reading /proc/interrupts to see if the keyboard interrupt
 	# increases while the timer is running. A TIMEOUT of 0 will always launch altboot.	
-	run_timer >/dev/tty1 2>&1
-
+	run_timer >/dev/tty1 
 		
 	echo "" >/dev/tty0
 	
@@ -342,7 +341,7 @@ else
 		launch_selection /etc/altboot-menu >/dev/tty0
 
 	fi
-	# Anything after this point will never be reached if $launch_altboot != yes
+	# Anything after this point will never be reached if $launch_altboot != yes	
 	
 	# Show the altboot menu
 	show_menu /etc/altboot-menu >/dev/tty0