merge of 0db003fda92c4fe80ee76010788aa8e895b485eb

     and 84edeec7571f3127230e5ca62b68488474946bcf

4 files changed, 11 insertions, 129 deletions

diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 54d260a76a..20245ef251 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -34,6 +34,10 @@ do_install() {
 	install -m 0644 ${WORKDIR}/altboot.rc/*.txt ${D}/etc/altboot.rc	
 }		
 
+do_configure() {
+	cat ${WORKDIR}/init.altboot | sed "s/^VERSION=.*/VERSION=\"0.0.0 Developer Snapshot (${DATE})\"/" > ${WORKDIR}/init.altboot_
+	mv ${WORKDIR}/init.altboot_ ${WORKDIR}/init.altboot
+}
 
 
 pkg_postinst() {
diff --git a/packages/altboot/altboot_0.0.5-rc2.bb b/packages/altboot/altboot_0.0.5-rc2.bb
deleted file mode 100644
index e4e20b5abe..0000000000
--- a/packages/altboot/altboot_0.0.5-rc2.bb
+++ /dev/null
@@ -1,123 +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_0.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"
-
-######################################################################################
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
-
-SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=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	
-}		
-
-pkg_postinst() {
-	update-alternatives --install /sbin/init init /sbin/init.altboot 55
-}
-
-pkg_postinst_spitz() {
-	# Note: Spitz support is a royal pain in the ass.
-	#       Since Spitz pivot_roots by default, there is no real way
-	#	a user can install an altboot.ipk into the flash FS.
-	#	So we need to do that manually (*SIGH*)
-
-	# /l/m only exists on the HDD on spitz
-	if test -d /lib/modules
-	then
-	   if [ -e /media/realroot/sbin/init ]; then
-	      ROOT_MOUNT_POINT="/media/realroot"
-	   elif [ -e /media/ROM/sbin/init ]; then
-	      ROOT_MOUNT_POINT="/media/ROM"
-	   fi
-	   if [ ! "$ROOT_MOUNT_POINT" = "" ]; then
-	      ROOT_MOUNT_DEVICE=`cat /proc/mounts | grep $ROOT_MOUNT_POINT | grep jffs2 | cut -d " " -f 1`
-	      if [ ! "$ROOT_MOUNT_DEVICE" = "" ]; then
-	         mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT
-	         cp -R /etc/altboot* $ROOT_MOUNT_POINT/etc
-	         cp /sbin/init.altboot $ROOT_MOUNT_POINT/sbin
-	         if [ -f $ROOT_MOUNT_POINT/sbin/init ]; then
-	         	 mv $ROOT_MOUNT_POINT/sbin/init $ROOT_MOUNT_POINT/sbin/init.orig
-	         fi
-	         ln -s /sbin/init.altboot $ROOT_MOUNT_POINT/sbin/init
-	      fi
-	   fi
-	fi
-}
-
-pkg_postrm() {
-	update-alternatives --remove init /sbin/init.altboot
-}
-
-pkg_postrm_spitz() {
-	if test -d /lib/modules
-        then
-           if [ -e /media/realroot/sbin/init ]; then
-              ROOT_MOUNT_POINT="/media/realroot"
-           elif [ -e /media/ROM/sbin/init ]; then
-              ROOT_MOUNT_POINT="/media/ROM"
-           fi
-           if [ ! "$ROOT_MOUNT_POINT" = "" ]; then
-              ROOT_MOUNT_DEVICE=`cat /proc/mounts | grep $ROOT_MOUNT_POINT | grep jffs2 | cut -d " " -f 1`
-              if [ ! "$ROOT_MOUNT_DEVICE" = "" ]; then
-                 mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT
-	         if [ -f $ROOT_MOUNT_POINT/sbin/init.orig ]; then
-	            rm $ROOT_MOUNT_POINT/sbin/init
-	            rm $ROOT_MOUNT_POINT/sbin/init.altboot
-	            mv $ROOT_MOUNT_POINT/sbin/init.orig $ROOT_MOUNT_POINT/sbin/init
-	         else
-	   	 echo "$ROOT_MOUNT_POINT/sbin/init.orig not found, not uninstalling altboot!"
-	         fi
-	      fi
-           fi
-	fi
-}
-
-
-
-
diff --git a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick
index c5222800e5..3cf8c506b0 100644
--- a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick
+++ b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick
@@ -8,6 +8,7 @@
 M_TITLE="Boot USB Storage"
 
 test "$USB_HOST_AVAILABLE" = "yes" || exit 0
+
 die() {
 	echo "ERROR: $1" >/dev/tty0
 	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 6dfad21374..9b570111e8 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -119,19 +119,17 @@ pivot_image() {
 	echo "Setting up loopback (/dev/loop0) for $IMAGE_NAME"
 	losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME || die "losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME failed!"
 	check_fs /dev/loop0 $IMAGE_TYPE
-
-	losetup -d /dev/loop0
+	
 	echo -e "\n* * * Booting rootfs image * * *\n"
 
-
 	# Busybox's "mount" doesn't seem to like "-o loop" for some reason
 	# It works on collie and b0rks on poodle.
 	if [ "$IMAGE_TYPE" = "" ]; then
 		IMAGE_TYPE="auto"
 	fi
 	# If mount fails it has the tendency to spew out a _lot_ of error messages.
-	# We direct the output to /dev/null so the user can see which step actually failed.
-	mount -o loop -t $IMAGE_TYPE $1/$IMAGE_PATH/$IMAGE_NAME /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!"
+	# We direct the output to /dev/null so the user can see which step actually failed.	
+	mount /dev/loop0 -t $IMAGE_TYPE /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!"	
 
 	mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed"
 
@@ -310,7 +308,7 @@ init_rootfs(){
 	fi
 	
 	echo -n "Generating device files..." >/dev/tty0
-	/etc/init.d/devices start && echo ok  >/dev/tty0|| die "FAILED"
+	/etc/init.d/devices start && echo ok  >/dev/tty0 || die "FAILED"
 }
 
 mount_sd(){
@@ -360,6 +358,8 @@ mount_cf(){
 
 		# Give the SD and CF mounting some time. This is a must for SD			
 		sleep 2
+		
+		mount /media/cf
 	fi
 }