[oe-commits] org.oe.dev slugos-init: Remove special altboot support - turnup flash is all that is required.

[rwhitby commit]

slugos-init: Remove special altboot support - turnup flash is all that is required.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: ebdffc893fb36ab4655f6e5b18629fee23d9da16
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ebdffc893fb36ab4655f6e5b18629fee23d9da16
Files:
1
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_0.10.bb
Diffs:

#
# mt diff -r1d9f268bc89239825562b058da39c3adca103c95 -rebdffc893fb36ab4655f6e5b18629fee23d9da16
#
# 
# 
# patch "packages/slugos-init/files/turnup"
#  from [529b42ee1e622c38ad265e058c50a0bed9be15d3]
#    to [ddb31542c5e4a8c055b1dc685e77e98178f83323]
# 
# patch "packages/slugos-init/slugos-init_0.10.bb"
#  from [be3ab36a7db3bb306535a5acb634caf5c180451b]
#    to [816a1b184a877b76f2cada355b334dfe24d06898]
# 
============================================================
--- packages/slugos-init/files/turnup	529b42ee1e622c38ad265e058c50a0bed9be15d3
+++ packages/slugos-init/files/turnup	ddb31542c5e4a8c055b1dc685e77e98178f83323
@@ -372,8 +372,6 @@ boot_rootfs() {
 	nfs)	shift 2;;
 	flash)	;;
 	ram)	;;
-	altboot)
-		;;
 	*)	echo "turnup: boot_rootfs($type, $ffs, $device): unknown type" >&2
 		return 1;;
 	esac
@@ -407,11 +405,6 @@ boot_rootfs() {
 			echo "turnup: boot_rootfs: failed to write $ffs/linuxrc.new" >&2
 			return 1
 		};;
-	altboot)
-		ln -s "boot/altboot" "$ffs"/linuxrc.new || {
-			echo "turnup: boot_rootfs: failed to create $ffs/linuxrc.new" >&2
-			return 1
-		};;
 	*)	{	echo '#!/bin/sh'
 #			echo 'modprobe ehci-hcd'
 #			echo 'modprobe ohci-hcd'
@@ -579,7 +572,7 @@ boot_reset() {
 	local ffs typ status
 
 	case "$1" in
-	flash|ram|altboot)type="$1"
+	flash|ram)type="$1"
 		shift;;
 	*)	echo "turnup: boot_reset($1): invalid type" >&2
 		return 1;;
@@ -806,8 +799,6 @@ ram)	boot_reset ram;;
 	nfs "$@";;
 flash)	boot_reset flash;;
 ram)	boot_reset ram;;
-altboot)
-	boot_reset altboot;;
 preserve)
 	shift
 	sysconf save "$@";;
@@ -850,8 +841,6 @@ usage: turnup command [options]
   ram
     Boot (once) into a ramdisk, subsequent boots will be to
     the flash file system.
-  altboot
-    Hand over boot control to the altboot utility.
   preserve
     Save the system configuration to the SysConf partition, you
     will need to create the SysConf partition from the boot loader
============================================================
--- packages/slugos-init/slugos-init_0.10.bb	be3ab36a7db3bb306535a5acb634caf5c180451b
+++ packages/slugos-init/slugos-init_0.10.bb	816a1b184a877b76f2cada355b334dfe24d06898
@@ -1,10 +1,10 @@ RDEPENDS = "busybox devio"
 DESCRIPTION = "SlugOS initial network config via sysconf"
 SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r81"
+PR = "r82"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
@@ -102,9 +102,6 @@ do_install() {
 		install -m 0755 boot/$p ${D}/boot
 	done
 
-	# Support for altboot
-	ln -s /sbin/init.altboot ${D}/boot/altboot
-
 	# Configuration files
 	install -m 0644 conffiles ${D}${sysconfdir}/default