diff options
| author | Matthias Hentges <oe@hentges.net> | 2006-04-03 07:48:01 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-03 07:48:01 +0000 |
| commit | 7b4a0c125c3476655207bc2ec5fbb771b1712721 (patch) | |
| tree | 172befbeea5d9c0cf42b87cd28aa0e88318fbd58 /packages | |
| parent | 2764aaf7448ae074224d84fc94e886d2fb20ce6c (diff) | |
altboot: Change the way we check if altboot is called by the kernel or the user.The old function only worked because on most Zaurii /var is lost on reboot.
This fixes altboot on Spitz / Borzoi w/ kernel 2.6.
Courtesy polyonymous @ #openzaurus
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/altboot/altboot_0.0.0.bb | 2 | ||||
| -rw-r--r-- | packages/altboot/files/init.altboot | 4 | ||||
| -rw-r--r-- | packages/altboot/files/spitz/altboot-2.6.cfg | 30 |
3 files changed, 33 insertions, 3 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 685633cdd8..b1e2fd7a33 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r29" +PR = "r30" SRC_URI = "file://altboot-menu \ diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 665b3fa4b5..dc3900dcca 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -8,7 +8,7 @@ test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" CURRENT_ENV="`set`" -VERSION="0.0.4" +VERSION="DEVELOPER SNAPSHOT" # Set some defaults in case altboot.cfg is missing REAL_INIT="/sbin/init.sysvinit" @@ -280,7 +280,7 @@ wait_for_input() { # * * * * * * This is the main function * * * * * * -if test "`runlevel`" != "unknown" -a "$1" != "-force" +if test -f /proc/cmdline -a "$1" != "-force" then echo "altboot: Using real init [$REAL_INIT] [$*] *" >/dev/tty1 exec $REAL_INIT $* diff --git a/packages/altboot/files/spitz/altboot-2.6.cfg b/packages/altboot/files/spitz/altboot-2.6.cfg new file mode 100644 index 0000000000..69f7c8351b --- /dev/null +++ b/packages/altboot/files/spitz/altboot-2.6.cfg @@ -0,0 +1,30 @@ +# Handled by /sbin/init.altboot +# Allow booting images from SD or CF instead of booting +# the ROM. +ENABLE_ALTBOOT="yes" +TIMEOUT="4" +REAL_INIT="/sbin/init.sysvinit" +SH_SHELL="/bin/sh" + +IMAGE_PATH="boot-images" +IMAGE_TYPE="ext2" +FSCK_IMAGES="yes" + +SD_DEVICE="/dev/mmcblk0p1" +SD_KERNEL_MODULE="" + +USB_HOST_AVAILABLE="no" +USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" +USB_STORAGE_PARTITION="/dev/sda1" +USB_STORAGE_WAIT="4" + +KEXEC_KERNEL_DIR="/boot" +KEXEC_BIN="/usr/sbin/kexec" + +INIT_RUNLEVEL="5" +NO_GUI_RL="2" +MASTER_PASSWORD="" +ASK_PW_ON_BOOT="no" + +SD_MOUNTPOINT="/media/card" +CF_MOUNTPOINT="/media/cf" |