summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/foonas-init/files/boot/.mtn2git_empty0
-rw-r--r--packages/foonas-init/files/boot/disk67
-rw-r--r--packages/foonas-init/files/boot/flash13
-rw-r--r--packages/foonas-init/files/boot/network16
-rw-r--r--packages/foonas-init/files/boot/nfs19
-rw-r--r--packages/foonas-init/files/boot/udhcpc.script17
-rw-r--r--packages/foonas-init/foonas-init_0.10.bb28
7 files changed, 3 insertions, 157 deletions
diff --git a/packages/foonas-init/files/boot/.mtn2git_empty b/packages/foonas-init/files/boot/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/foonas-init/files/boot/.mtn2git_empty
+++ /dev/null
diff --git a/packages/foonas-init/files/boot/disk b/packages/foonas-init/files/boot/disk
deleted file mode 100644
index b4bbaf1f3c..0000000000
--- a/packages/foonas-init/files/boot/disk
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# boot from the hard disk partition "$1" (which
-# must be given) using options from the rest of
-# the command line.
-#
-# Use the standard init path (see /etc/init.d/rcS)
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
-#
-# Load the helper functions
-. /etc/default/functions
-. /etc/default/modulefunctions
-#
-#
-if test -n "$1"
-then
- device="$1"
- shift
- # proc is needed for UUID mount and module load
- mount -t proc proc /proc
- # load USB & SCSI storage modules (/proc required!)
- if [ "$(machine)" != "storcenter" ]; then
- echo "boot: loading modules required for disk boot"
- loaddiskmods
- # waiting for disk (FIXME)
- sleep=6
- test "$sleep" -gt 0 && sleep "$sleep"
- else
- # make the device links so turnup can use short disk names.
- # probably only necessary on devfs based systems.
- /etc/init.d/devices start
- scc -l redflash -f auto
- fi
- #
- # fire the boot
- echo "boot: rootfs: mount $* $device [$UUID]"
- #
- # Mount read-write because before exec'ing init
- # If a UUID is given (in the environment) this
- # is used in preference to the device, but if
- # the UUID mount fails a standard device mount
- # is attempted.
- if test -n "$UUID" &&
- mount "$@" -U "$UUID" /mnt ||
- mount "$@" "$device" /mnt
- then
- # checkmount checks for sh, chroot, init
- # and /mnt (i.e. /mnt/mnt in this case)
- if checkmount /mnt
- then
- # if mounted, then move /dev to the new root
- mount --bind /dev /mnt/dev
- # pivot to /initrd if available, else /mnt
- cd /
- if test -d /mnt/initrd
- then
- swivel mnt initrd
- else
- swivel mnt mnt
- fi
- # swivel failed
- fi
- # Failure: unmount the partition
- umount /mnt
- fi
-fi
-# fallback - use the flash boot
-exec /boot/flash
diff --git a/packages/foonas-init/files/boot/flash b/packages/foonas-init/files/boot/flash
deleted file mode 100644
index 40f64c9701..0000000000
--- a/packages/foonas-init/files/boot/flash
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# boot from the current (flash) root partition
-# nothing need be done apart from setting the
-# system LED status correctly
-. /etc/default/functions
-scc -l redflash -f auto
-test -x /sbin/init && exec /sbin/init
-# fallback if /sbin/init has been deleted (bad!)
-scc -l red
-exec <>/dev/console >&0 2>&0
-test -x /sbin/sulogin && exec /sbin/sulogin
-test -x /bin/sh && exec /bin/sh
-exit 1
diff --git a/packages/foonas-init/files/boot/network b/packages/foonas-init/files/boot/network
deleted file mode 100644
index 599250e744..0000000000
--- a/packages/foonas-init/files/boot/network
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# bring up the network before boot, used to allow
-# netconsole logging and NFS boot. This runs out
-# of flash, but that's ok because the script doesn't
-# leave any process running.
-#
-# NOTE: /etc/default/functions defines ifup as a shell
-# function!
-. /etc/default/functions
-#
-# Now all the information for booting should be in the configuration
-# file. Config the loopback and network interfaces.
-ifconfig lo 127.0.0.1 up
-iface="$(config iface)"
-test -n "$iface" && ifup "$iface"
-# exit code is true only if the interface config has succeeded
diff --git a/packages/foonas-init/files/boot/nfs b/packages/foonas-init/files/boot/nfs
deleted file mode 100644
index 7cfce66cbb..0000000000
--- a/packages/foonas-init/files/boot/nfs
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# boot from the nfs partition "$1" (which
-# must be given) using options from the rest of
-# the command line.
-#
-# Use the standard init path (see /etc/init.d/rcS)
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
-#
-. /etc/default/functions
-scc -l redflash -f auto
-#
-if /boot/network
-then
- # network is up and running, the NFS mount will
- # now succeed (possibly), use /boot/disk
- exec /boot/disk "$@"
-fi
-# fallback - use the flash boot
-exec /boot/flash
diff --git a/packages/foonas-init/files/boot/udhcpc.script b/packages/foonas-init/files/boot/udhcpc.script
deleted file mode 100644
index 3f437e3143..0000000000
--- a/packages/foonas-init/files/boot/udhcpc.script
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# executed by udhcpc to do the real work of configuring an interface
-# writes the result (if any) to file descriptor 9
-case "$1" in
-deconfig) # ignored
- :;;
-renew|bound) # this gives the real information
- test -n "$ip" && {
- echo "ip='$ip'"
- echo "subnet='$subnet'"
- echo "broadcast='$broadcast'"
- echo "router='$router'"
- } >&9;;
-leasefail) # ignore - probably no dhcp server
- :;;
-*) echo "udhcpc: $*: command not recognised" >&2;;
-esac
diff --git a/packages/foonas-init/foonas-init_0.10.bb b/packages/foonas-init/foonas-init_0.10.bb
index 80166793a5..c8a1b05232 100644
--- a/packages/foonas-init/foonas-init_0.10.bb
+++ b/packages/foonas-init/foonas-init_0.10.bb
@@ -4,14 +4,9 @@ PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r0"
-
-SRC_URI = "file://boot/flash \
- file://boot/disk \
- file://boot/nfs \
- file://boot/network \
- file://boot/udhcpc.script \
- file://initscripts/fixfstab \
+PR = "r1"
+
+SRC_URI = "file://initscripts/fixfstab \
file://initscripts/syslog.buffer \
file://initscripts/syslog.file \
file://initscripts/syslog.network \
@@ -32,7 +27,6 @@ SBINPROGS = ""
USRSBINPROGS = ""
CPROGS = "${USRSBINPROGS} ${SBINPROGS}"
SCRIPTS = "turnup reflash sysconf"
-BOOTSCRIPTS = "flash disk nfs network udhcpc.script"
INITSCRIPTS = "syslog.buffer syslog.file syslog.network \
rmrecovery sysconfsetup umountinitrd.sh \
fixfstab loadmodules.sh"
@@ -62,11 +56,6 @@ do_install() {
${D}${sbindir} \
${D}${base_sbindir} \
${D}/initrd \
- ${D}/boot
-
- # linuxrc
- rm -f ${D}/linuxrc
- ln -s boot/flash ${D}/linuxrc
# C programs
for p in ${USRSBINPROGS}
@@ -97,13 +86,6 @@ do_install() {
# Udev configuration files
install -m 0644 links.conf ${D}${sysconfdir}/udev
- #
- # Boot scripts
- for p in ${BOOTSCRIPTS}
- do
- install -m 0755 boot/$p ${D}/boot
- done
-
# Configuration files
install -m 0644 conffiles ${D}${sysconfdir}/default
@@ -138,7 +120,3 @@ pkg_postrm_foonas-init() {
PACKAGES = "${PN}"
FILES_${PN} = "/"
-
-# It is bad to overwrite /linuxrc as it puts the system back to
-# a flash boot (and the flash has potentially not been upgraded!)
-CONFFILES_${PN} = "/linuxrc ${sysconfdir}/default/conffiles"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 07:15:29 +0000