diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-03-30 20:10:27 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-03-30 20:10:27 +0000 |
| commit | 0159d92a1de8f5e915c7d0a4f54aec6eb6d9a174 (patch) | |
| tree | 057a7dd4dc56ac19c18cafd29695bdfc8a65ae55 /packages | |
| parent | 1eeee6b6536402482d753e87ba1d44ce84eaf359 (diff) | |
| parent | 49464dcea63bcd4fc2599216b71e78617912f16e (diff) | |
merge of '24a361b09feb3d013916a5f821f3e40842578ebd'
and 'ebdffc893fb36ab4655f6e5b18629fee23d9da16'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/slugos-init/files/turnup | 13 | ||||
| -rw-r--r-- | packages/slugos-init/slugos-init_0.10.bb | 5 |
2 files changed, 2 insertions, 16 deletions
diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 119d84f2c8..556d942e26 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -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 @@ nfs) shift 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 diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 90ad6f4cee..8f8c68d7b7 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ 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 |