5 files changed, 90 insertions, 34 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 5981b41231..82314a8f22 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 = "r32"
+PR = "r33"
 
 
 SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/altboot_1.0.6-rc1.bb b/packages/altboot/altboot_1.0.6-rc1.bb
new file mode 100644
index 0000000000..bb99fe31e5
--- /dev/null
+++ b/packages/altboot/altboot_1.0.6-rc1.bb
@@ -0,0 +1,82 @@
+#! /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/files/borzoi/.mtn2git_empty b/packages/altboot/files/borzoi/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/altboot/files/borzoi/.mtn2git_empty
+++ /dev/null
diff --git a/packages/altboot/files/borzoi/altboot-2.6.cfg b/packages/altboot/files/borzoi/altboot-2.6.cfg
deleted file mode 100644
index 69f7c8351b..0000000000
--- a/packages/altboot/files/borzoi/altboot-2.6.cfg
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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"
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index dc3900dcca..ed95ce1c9c 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -243,9 +243,13 @@ wait_for_input() {
 		# above to launch the altboot menu.		
 				
  		
-		# This filters an "<ENTER>" from the user as "any key"
-		( while :; do read x< /dev/tty0 2>&1; done; ) > /dev/null 2>&1 &
-		sleep 1; kill $!
+		# Bash throws an ugly error on kill
+		if ! (readlink /bin/sh | grep -q bash)
+		then
+			# This filters an "<ENTER>" from the user as "any key"
+			( while :; do read x< /dev/tty0 2>&1; done; ) > /dev/null 2>&1 &
+			sleep 1; kill $! >/dev/null 2>&1
+		fi