merge of '6219faf600ddbd4c2c3b44a157a842316dfa00d8'

     and '87fdd2d36ae67f50ee78c7ecd82a94682bcfe372'

6 files changed, 17 insertions, 4 deletions

diff --git a/packages/altboot/files/altboot-menu/15-bootSD b/packages/altboot/files/altboot-menu/15-bootSD
index 0476a5ce0f..3cf49deea5 100644
--- a/packages/altboot/files/altboot-menu/15-bootSD
+++ b/packages/altboot/files/altboot-menu/15-bootSD
@@ -7,6 +7,8 @@
 
 M_TITLE="Boot SD card"
 
+test "$DISABLE_SD_BOOT" = yes && exit 0
+
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 	
diff --git a/packages/altboot/files/altboot-menu/20-bootCF b/packages/altboot/files/altboot-menu/20-bootCF
index 36d6b8245f..4add6e6631 100644
--- a/packages/altboot/files/altboot-menu/20-bootCF
+++ b/packages/altboot/files/altboot-menu/20-bootCF
@@ -7,6 +7,8 @@
 
 M_TITLE="Boot CF card"
 
+test "$DISABLE_CF_BOOT" = yes && exit 0
+
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 	
diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
index 87373d8eec..4f5c195be2 100644
--- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
+++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
@@ -9,6 +9,8 @@
 
 M_TITLE="Boot from NFS"
 
+test "$DISABLE_NFS_BOOT" = yes && exit 0
+
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 
diff --git a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh
index 4619e51ce7..6c9aef3f3e 100644
--- a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh
+++ b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh
@@ -1,6 +1,7 @@
 # !/bin/sh
 M_TITLE="init=/bin/sh"
 
+test "$DISABLE_BINSH_BOOT" = yes && exit 0
 
 run_module() {
 	
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index b872af2d20..033fb2124f 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -95,7 +95,9 @@ show_menu() {
 	do	
 		if ! test -d "$1/$file"
 		then			
-			M_TITLE="`$1/$file title`"
+			# NOTE: It is important to use "." here so that the script inherits
+			# the shell environment / all set variables!						
+			M_TITLE="`. $1/$file title`"
 			FLAGS="`$1/$file flags`"
 			
 			if ! test -z "$M_TITLE"
diff --git a/packages/altboot/files/poodle/altboot-2.6.cfg b/packages/altboot/files/poodle/altboot-2.6.cfg
index d976ee3a20..908a9ac88f 100644
--- a/packages/altboot/files/poodle/altboot-2.6.cfg
+++ b/packages/altboot/files/poodle/altboot-2.6.cfg
@@ -1,5 +1,5 @@
 #
-# Altboot machine configuration for: Akita / Kernel 2.6
+# Altboot machine configuration for: Poodle / Kernel 2.6
 #
 
 # Handled by /sbin/init.altboot
@@ -10,7 +10,7 @@ TIMEOUT="4"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 
-ENABLE_SOUND="yes"
+ENABLE_SOUND="no"
 
 IMAGE_PATH="boot-images"
 IMAGE_TYPE="ext2"
@@ -20,7 +20,7 @@ ENABLE_IMAGECONF="yes"
 SD_DEVICE="/dev/mmcblk0p1"
 SD_KERNEL_MODULE=""
 
-USB_HOST_AVAILABLE="no"
+USB_HOST_AVAILABLE="yes"
 USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod"
 USB_STORAGE_PARTITION="/dev/sda1"
 USB_STORAGE_WAIT="4"
@@ -39,3 +39,7 @@ ASK_PW_ON_BOOT="no"
 
 SD_MOUNTPOINT="/media/card"
 CF_MOUNTPOINT="/media/cf"
+
+# Poodle already boots off SD natively!
+DISABLE_SD_BOOT="yes"
+