summaryrefslogtreecommitdiff
path: root/packages/altboot
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-11-20 15:48:29 +0000
committerMatthias Hentges <oe@hentges.net>2006-11-20 15:48:29 +0000
commit6dbc26661f6dc3c1d468be596b52a9b2a52c9b96 (patch)
treeee707050114b603d485c60965187fb4b2f73afc8 /packages/altboot
parent279f77d8047f7cd039dad30ee834e45cd1e26024 (diff)
altboot: Do not show SD-Boot option on Poodle
Diffstat (limited to 'packages/altboot')
-rw-r--r--packages/altboot/altboot_0.0.0.bb2
-rw-r--r--packages/altboot/altboot_1.1.0-wip.bb2
-rw-r--r--packages/altboot/files/altboot-menu/15-bootSD2
-rw-r--r--packages/altboot/files/altboot-menu/20-bootCF2
-rw-r--r--packages/altboot/files/altboot-menu/Advanced/40-bootNFS2
-rw-r--r--packages/altboot/files/altboot-menu/Advanced/55-bin-sh1
-rw-r--r--packages/altboot/files/init.altboot4
-rw-r--r--packages/altboot/files/poodle/altboot-2.6.cfg10
8 files changed, 19 insertions, 6 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 3908b5dacd..8cc722e603 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -20,7 +20,7 @@ RDEPENDS_${PN} = "${PN}-conf"
######################################################################################
-PR = "r49"
+PR = "r50"
######################################################################################
diff --git a/packages/altboot/altboot_1.1.0-wip.bb b/packages/altboot/altboot_1.1.0-wip.bb
index df9ac5abfb..1ca672d7ce 100644
--- a/packages/altboot/altboot_1.1.0-wip.bb
+++ b/packages/altboot/altboot_1.1.0-wip.bb
@@ -23,7 +23,7 @@ RDEPENDS_${PN}-conf = "${PN}"
######################################################################################
-WIP_DATE = "20061108"
+WIP_DATE = "20061120"
PR = "${WIP_DATE}-r1"
######################################################################################
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"
+