merge of 5945a66a6847c21d25595376695c23f3971f6f8a

     and e544df2d6779a2a53f1c47a6d1e1961d875d17af

10 files changed, 0 insertions, 495 deletions

diff --git a/packages/altboot/files/spitz/altboot-menu/.mtn2git_empty b/packages/altboot/files/spitz/altboot-menu/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/altboot/files/spitz/altboot-menu/.mtn2git_empty
+++ /dev/null
diff --git a/packages/altboot/files/spitz/altboot-menu/00-Default b/packages/altboot/files/spitz/altboot-menu/00-Default
deleted file mode 100644
index 01818262a3..0000000000
--- a/packages/altboot/files/spitz/altboot-menu/00-Default
+++ /dev/null
@@ -1,54 +0,0 @@
-# !/bin/sh
-M_TITLE="Normal Boot"
-
-# Note for Spitz: The HDD has already been mounted in /media/hdd from
-# /etc/altboot.rc/00-Default.sh
-
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
-run_module() {
-	
-	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"	
-	
-	test -z "$SPITZ_HDD_PART" && SPITZ_HDD_PART="/dev/hda1"
-	echo "Spitz: Mounting [$SPITZ_HDD_PART] as /media/hdd"
-	mount -t proc proc /proc || echo "Mounting /proc failed!"
-
-	mount -o remount,rw / 
-
-	# Note: Redirecting STDIN & STDOUT is required, cardmg will die otherwise
-	cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!"
-
-	check_fs $SPITZ_HDD_PART $SPITZ_HDD_TYPE
-	if [ "$SPITZ_HDD_TYPE" = "" ]; then
-		SPITZ_HDD_TYPE="auto"
-	fi
-	
-	# I've seen busybox die a horrible death on "!"...
-	if (mount -t $SPITZ_HDD_TYPE $SPITZ_HDD_PART /media/hdd)
-	then
-		a=a
-	else
-		echo "ERROR: mount -t ext3 $SPITZ_HDD_PART /media/hdd failed!"
-		exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-	fi
-
-	# There are no device files on Spitz yet, requires HDD (bad for testing
-	# with CF)
-	for n in 0 1 2 3 4 5
-	do
-		! test -e /dev/loop$n && mknod /dev/loop$n b 7 $n
-	done
-	
-	# Check for /sbin/init and / or loop-images	
-	check_target "/media/hdd" 5
-}
-
-case "$1" in
-title)	echo "$M_TITLE";;
-run)	run_module;;
-esac
-
diff --git a/packages/altboot/files/spitz/altboot-menu/10-noGui b/packages/altboot/files/spitz/altboot-menu/10-noGui
deleted file mode 100644
index e4e8b0fe37..0000000000
--- a/packages/altboot/files/spitz/altboot-menu/10-noGui
+++ /dev/null
@@ -1,47 +0,0 @@
-# !/bin/sh
-M_TITLE="Don't launch GUI"
-
-
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
-run_module() {
-	
-	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"	
-	
-	test -z "$SPITZ_HDD_PART" && SPITZ_HDD_PART="/dev/hda1"
-	echo "Spitz: Mounting [$SPITZ_HDD_PART] as /media/hdd"
-	mount -t proc proc /proc || echo "Mounting /proc failed!"
-
-	mount -o remount,rw / 
-
-	# Note: Redirecting STDIN & STDOUT is required, cardmg will die otherwise
-	cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!"
-	
-	# I've seen busybox die a horrible death on "!"...
-	if (mount -t auto $SPITZ_HDD_PART /media/hdd)
-	then
-		a=a
-	else
-		echo "ERROR: mount -t ext3 $SPITZ_HDD_PART /media/hdd failed!"
-		exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-	fi
-
-	# There are no device files on Spitz yet, requires HDD (bad for testing
-	# with CF)
-	for n in 1 2 3 4 5
-	do
-		! test -e /dev/loop$n && mknod /dev/loop$n b 7 $n
-	done
-	
-	# Check for /sbin/init and / or loop-images	
-	check_target "/media/hdd" 2
-}
-
-case "$1" in
-title)	echo "$M_TITLE";;
-run)	run_module;;
-esac
-
diff --git a/packages/altboot/files/spitz/altboot-menu/15-bootSD b/packages/altboot/files/spitz/altboot-menu/15-bootSD
deleted file mode 100644
index d22316033c..0000000000
--- a/packages/altboot/files/spitz/altboot-menu/15-bootSD
+++ /dev/null
@@ -1,64 +0,0 @@
-# !/bin/sh
-#
-# Copyright Matthias Hentges (c) 2005
-#
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL)
-
-
-M_TITLE="Boot SD card"
-
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
-# This function is activated by init.altboot by calling this script with the "run" option
-run_module() {
-	
-	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"
-	
-	echo -n "Mounting rootfs rw..." >/dev/tty0
-	mount -o remount,rw / >/dev/tty0 2>&1 && echo ok  >/dev/tty0|| die "mount -o remount,rw / failed"
-
-	test -z "$SPITZ_HDD_PART" && SPITZ_HDD_PART="/dev/hda1"	
-	mount -t proc proc /proc || echo "Mounting /proc failed!"
-
-	# Note: Redirecting STDIN & STDOUT is required, cardmg will die otherwise
-	cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!"
-	
-	# I've seen busybox die a horrible death on "!"...
-	if (mount -t auto $SPITZ_HDD_PART /media/hdd)
-	then
-		a=a
-	else
-		echo "ERROR: mount -t auto $SPITZ_HDD_PART /media/hdd failed!"
-		exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-	fi
-
-#	echo -n "Generating device files..." >/dev/tty0
-#	/etc/init.d/devices start && echo ok  >/dev/tty0|| die "FAILED"
-
-# FIXME: generate device-files	
-
-	echo -n "Loading SD kernel module..."
-	/sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed"
-
-	echo -n "Mounting $SD_MOUNTPOINT..."  >/dev/tty0
-	/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok  >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed"
-		
-	echo ""
-
-	# Give the SD and CF mounting some time. This is a must for SD			
-	sleep 2
-	
-	# Check for a real fs and loop-images.
-	check_target "$SD_MOUNTPOINT" >/dev/tty0
-		
-}
-
-
-case "$1" in
-title)	echo "$M_TITLE";;
-run)	run_module "$2";;
-esac
-
diff --git a/packages/altboot/files/spitz/altboot-menu/20-bootCF b/packages/altboot/files/spitz/altboot-menu/20-bootCF
deleted file mode 100644
index 3f19b4ee48..0000000000
--- a/packages/altboot/files/spitz/altboot-menu/20-bootCF
+++ /dev/null
@@ -1,49 +0,0 @@
-# !/bin/sh
-#
-# Copyright Matthias Hentges (c) 2005
-#
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL)
-
-# FXIME: boot CF on spitz (hdb??)
-exit 0
-
-M_TITLE="Boot CF card"
-
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
-# This function is activated by init.altboot by calling this script with the "run" option
-run_module() {
-	
-	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"
-	
-	echo -n "Mounting rootfs rw..." >/dev/tty0
-	mount -o remount,rw / >/dev/tty0 2>&1 && echo ok  >/dev/tty0|| die "mount -o remount,rw / failed"
-
-	echo -n "Generating device files..." >/dev/tty0
-	/etc/init.d/devices start && echo ok  >/dev/tty0|| die "FAILED"
-
-		
-	echo -n "Mounting /proc..." >/dev/tty0
-	mount /proc >/dev/tty0 2>&1 && echo ok  >/dev/tty0|| die "mount /proc failed!"
-		
-	/etc/init.d/pcmcia start || die "/etc/init.d/pcmcia/start failed!"
-		
-	echo ""
-
-	# Give the SD and CF mounting some time. This is a must for SD			
-	sleep 2
-	
-	# Check for a real fs and loop-images.
-	check_target "$CF_MOUNTPOINT"
-		
-}
-
-
-case "$1" in
-title)	echo "$M_TITLE";;
-run)	run_module "$2";;
-esac
-
diff --git a/packages/altboot/files/spitz/altboot-menu/25-bootHDD3 b/packages/altboot/files/spitz/altboot-menu/25-bootHDD3
deleted file mode 100644
index 4280cdd35c..0000000000
--- a/packages/altboot/files/spitz/altboot-menu/25-bootHDD3
+++ /dev/null
@@ -1,80 +0,0 @@
-# !/bin/sh
-#
-# Copyright Matthias Hentges (c) 2005
-#
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL)
-
-
-# This file will teach you how to implement your own scripts while using existing altboot
-# code.
-
-# /sbin/init.altboot searches /etc/altboot-menu for scripts. It will only list scripts which
-# return a title when run with the "title" parameter. 
-# Script which do not return a title will never be shown in the boot menu!
-# 
-M_TITLE="Boot from images on HDD3"
-
-# The "title" parameter is implemented at the end of this script so it will never be reached
-# and the script will simply be ignored by altboot.
-
-
-# The die() function aborts the boot if something goes wrong and sets STDIN / STDERR / STDOUT
-# correctly.
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
-# This function is activated by init.altboot by calling this script with the "run" option
-run_module() {
-
-	# altboot.func contains re-useable code. If you intend to use check_target (see below)
-	# you must keep this line. If not, delete it.
-	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"	
-
-
-	# The only thing you'll have to do is get your medium mounted.
-	# The following lines mount a SD card on 2.4-series kernels on a Zaurus
-	
-	##########################################
-	
-	
-	echo -n "Mounting rootfs rw..." >/dev/tty0
-	mount -o remount,rw / >/dev/tty0 2>&1 && echo ok  >/dev/tty0|| die "mount -o remount,rw / failed"
-
-	#echo -n "Generating device files..." >/dev/tty0
-	#/etc/init.d/devices start && echo ok  >/dev/tty0|| die "FAILED"
-
-	cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!"
-
-	check_fs $HDD3_DEVICE $HDD3_TYPE
-
-	echo -n "Mounting $HDD3_MOUNTPOINT..."  >/dev/tty0
-	if [ "$HDD3_TYPE" = "" ]; then
-		HDD3_TYPE="auto"
-	fi
-	/bin/mount -t $HDD3_TYPE -o defaults,noatime $HDD3_DEVICE $HDD3_MOUNTPOINT >/dev/null 2>&1 && echo ok  >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $HDD3_DEVICE $HDD3_MOUNTPOINT failed"
-		
-	echo ""
-
-	# Give the SD and CF mounting some time. This is a must for SD			
-	sleep 2
-	##########################################	
-	
-	# Once the medium (be it a CF or SD card, or even a NFS drive) is mounted somewhere,
-	# just call check_target with the mountpoint as parameter.
-	# check_target searches the medium for a real filesystem and loop-images and
-	# asks the user what to boot if there are several choices.
-	
-	# Check for a real fs and loop-images.
-	check_target "$HDD3_MOUNTPOINT" >/dev/tty0
-	
-	# Done :)
-		
-}
-
-
-case "$1" in
-title)	echo "$M_TITLE";;
-run)	run_module "$2";;
-esac
diff --git a/packages/altboot/files/spitz/altboot-menu/99-ownScripts-example b/packages/altboot/files/spitz/altboot-menu/99-ownScripts-example
deleted file mode 100644
index 61c0645176..0000000000
--- a/packages/altboot/files/spitz/altboot-menu/99-ownScripts-example
+++ /dev/null
@@ -1,81 +0,0 @@
-# !/bin/sh
-#
-# Copyright Matthias Hentges (c) 2005
-#
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL)
-
-
-# This file will teach you how to implement your own scripts while using existing altboot
-# code.
-
-# /sbin/init.altboot searches /etc/altboot-menu for scripts. It will only list scripts which
-# return a title when run with the "title" parameter. 
-# Script which do not return a title will never be shown in the boot menu!
-# 
-M_TITLE="altboot sample"
-
-# We can use that to deactivate certain scripts:
-exit 0
-
-# The "title" parameter is implemented at the end of this script so it will never be reached
-# and the script will simply be ignored by altboot.
-
-
-# The die() function aborts the boot if something goes wrong and sets STDIN / STDERR / STDOUT
-# correctly.
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
-# This function is activated by init.altboot by calling this script with the "run" option
-run_module() {
-
-	# altboot.func contains re-useable code. If you intend to use check_target (see below)
-	# you must keep this line. If not, delete it.
-	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"	
-
-
-	# The only thing you'll have to do is get your medium mounted.
-	# The following lines mount a SD card on 2.4-series kernels on a Zaurus
-	
-	##########################################
-	
-	
-	echo -n "Mounting rootfs rw..." >/dev/tty0
-	mount -o remount,rw / >/dev/tty0 2>&1 && echo ok  >/dev/tty0|| die "mount -o remount,rw / failed"
-
-	echo -n "Generating device files..." >/dev/tty0
-	/etc/init.d/devices start && echo ok  >/dev/tty0|| die "FAILED"
-
-
-	echo -n "Loading SD kernel module..."
-	/sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed"
-
-	echo -n "Mounting $SD_MOUNTPOINT..."  >/dev/tty0
-	/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok  >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed"
-		
-	echo ""
-
-	# Give the SD and CF mounting some time. This is a must for SD			
-	sleep 2
-	##########################################	
-	
-	# Once the medium (be it a CF or SD card, or even a NFS drive) is mounted somewhere,
-	# just call check_target with the mountpoint as parameter.
-	# check_target searches the medium for a real filesystem and loop-images and
-	# asks the user what to boot if there are several choices.
-	
-	# Check for a real fs and loop-images.
-	check_target "$SD_MOUNTPOINT" >/dev/tty0
-	
-	# Done :)
-		
-}
-
-
-case "$1" in
-title)	echo "$M_TITLE";;
-run)	run_module "$2";;
-esac
-
diff --git a/packages/altboot/files/spitz/altboot-menu/Advanced/.mtn2git_empty b/packages/altboot/files/spitz/altboot-menu/Advanced/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/altboot/files/spitz/altboot-menu/Advanced/.mtn2git_empty
+++ /dev/null
diff --git a/packages/altboot/files/spitz/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/spitz/altboot-menu/Advanced/40-bootNFS
deleted file mode 100644
index 6cac410019..0000000000
--- a/packages/altboot/files/spitz/altboot-menu/Advanced/40-bootNFS
+++ /dev/null
@@ -1,97 +0,0 @@
-# !/bin/sh
-#
-# Copyright Matthias Hentges (c) 2005
-#
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL)
-
-# FIXME: Make this work
-
-M_TITLE="Boot from NFS"
-
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
-# This function is activated by init.altboot by calling this script with the "run" option
-run_module() {
-
-	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"
-
-	echo -n "Mounting rootfs rw..." >/dev/tty0
-	mount -o remount,rw / >/dev/tty0 2>&1 && echo ok  >/dev/tty0|| die "mount -o remount,rw / failed"
-
-	echo -n "Generating device files..." >/dev/tty0
-	/etc/init.d/devices start && echo ok  >/dev/tty0|| die "FAILED"	
-
-	echo -n "Mounting /proc..." >/dev/tty0
-	mount /proc >/dev/tty0 2>&1 && echo ok  >/dev/tty0 || echo failed
-
-	# Needed for NFS
-	/etc/init.d/portmap start >/dev/tty1 2>&1 || die "/etc/init.d/portmap start failed!"
-	
-	# For some reason NFS mounts hang if /e/i/networking is not run.
-	# For the time beeing I'm to lazy to investigate ;)
-	/etc/init.d/networking start || die "/etc/init.d/networking start failed!"
-	
-	sleep 2
-	
-	# After the PCMCIA service is started, an inserted WLAN card should automatically
-	# activate itself.
-	/etc/init.d/pcmcia start || die "/etc/init.d/pcmcia/start failed!"
-	
-	# Give WLAN time to login into the network
-	echo "Waiting for WLAN..."
-	sleep 8
-		 
-	nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`"
-	nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`"	
-	
-	if test "` echo "$nfs_mountpoints" |wc -l | tr -d " "`" -gt 1
-	then
-		echo -e "Please select your NFS root:\n"
-
-		cnt=1
-		for nfs_mount in $nfs_mountpoints
-		do
-			echo -e "\t[$cnt] $nfs_mount"
-			let cnt=$cnt+1
-		done
-		
-		echo ""
-		
-		while test -z "$selection"
-		do
-			echo -n "Boot NFS root: "
-			read junk < /dev/tty1
-			
-			cnt=1
-			for nfs_mount in $nfs_mounts
-			do
-				if test "$junk" = "$cnt"
-				then
-					selection="$nfs_mount"
-				fi
-				let cnt=$cnt+1
-			done			
-			
-		done
-	else
-		test -z "$nfs_mounts" && die "No NFS mounts configured in /etc/fstab!"	
-		selection="$nfs_mounts"
-	fi
-	
-	mkdir -p /media/nfsroot || die "mkdir -p /media/nfsroot failed!"
-	
-	echo -n "Mounting NFS root..."
-	mount -t nfs "$selection" /media/nfsroot && echo ok || die "mount -t nfs "$selection" /media/nfsroot failed!"
-	
-	check_target "/media/nfsroot"
-	
-}	
-
-case "$1" in
-title)	echo "$M_TITLE";;
-run)	run_module "$2";;
-esac
-
diff --git a/packages/altboot/files/spitz/altboot-menu/Advanced/55-bin-sh b/packages/altboot/files/spitz/altboot-menu/Advanced/55-bin-sh
deleted file mode 100644
index 6db4adaf3a..0000000000
--- a/packages/altboot/files/spitz/altboot-menu/Advanced/55-bin-sh
+++ /dev/null
@@ -1,23 +0,0 @@
-# !/bin/sh
-M_TITLE="init=/bin/sh"
-
-
-run_module() {
-	
-	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"
-	
-	test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >/dev/tty0
-	
-	echo -e "\nBoot system with 'exec /sbin/init 5'\n"
-	while true
-	do
-		exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-		echo "WARNING: Shell was killed!"
-	done
-}
-
-case "$1" in
-title)	echo "$M_TITLE";;
-run)	run_module;;
-esac
-