diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-04-20 03:24:43 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-04-20 03:24:43 +0000 |
| commit | 7904db70d2bb52acbe095e12f98ed52d5381b5c0 (patch) | |
| tree | 7eda9680af74e60f002ad688b82a0dbacc43fb84 | |
| parent | 3c2c1b1b69099f69915fac013114ac7082ee6656 (diff) | |
| download | master-187ad058-7904db70d2bb52acbe095e12f98ed52d5381b5c0.tar.gz master-187ad058-7904db70d2bb52acbe095e12f98ed52d5381b5c0.tar.bz2 master-187ad058-7904db70d2bb52acbe095e12f98ed52d5381b5c0.zip | |
remove some redundant code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10870 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | package/base-files/files/etc/preinit | 27 | ||||
| -rwxr-xr-x | target/linux/generic-2.6/base-files/init | 43 |
2 files changed, 17 insertions, 53 deletions
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit index 452209ff90..66bb1a5cc1 100755 --- a/package/base-files/files/etc/preinit +++ b/package/base-files/files/etc/preinit @@ -59,17 +59,20 @@ set_state preinit echo "$HOTPLUG" > /proc/sys/kernel/hotplug eval ${FAILSAFE:+failsafe} lock -w /tmp/.failsafe -mount_root -[ -f /sysupgrade.tgz ] && { - echo "- config restore -" - cd / - mv sysupgrade.tgz /tmp - tar xzf /tmp/sysupgrade.tgz - rm -f /tmp/sysupgrade.tgz - sync -} -echo "- init -" +if [ -z "$INITRAMFS" ]; then + mount_root + [ -f /sysupgrade.tgz ] && { + echo "- config restore -" + cd / + mv sysupgrade.tgz /tmp + tar xzf /tmp/sysupgrade.tgz + rm -f /tmp/sysupgrade.tgz + sync + } + + echo "- init -" -killall hotplug2 -exec /sbin/init + killall hotplug2 + exec /sbin/init +fi diff --git a/target/linux/generic-2.6/base-files/init b/target/linux/generic-2.6/base-files/init index 0c795c69b4..45328384e9 100755 --- a/target/linux/generic-2.6/base-files/init +++ b/target/linux/generic-2.6/base-files/init @@ -1,48 +1,9 @@ #!/bin/sh # Copyright (C) 2006 OpenWrt.org -. /etc/diag.sh -export PATH=/bin:/sbin:/usr/bin:/usr/sbin -mount none /proc -t proc -mount none /sys -t sysfs -size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)?mt-l:s}' /proc/meminfo) -mount none /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777 +INITRAMFS=1 -if grep devfs /proc/filesystems > /dev/null; then - mount none /dev -t devfs - -elif [ -x /sbin/hotplug2 ]; then - mount -t tmpfs tmpfs /dev -o size=512K - mknod /dev/console c 5 1 - mkdir /dev/pts - mkdir /dev/shm - /sbin/hotplug2 --no-persistent --coldplug --max_children 1 - -elif [ -x /sbin/udevd ]; then - mount -n -t tmpfs -o mode=0755 udev /dev - mkdir /dev/pts - mkdir /dev/shm - - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" > /proc/sys/kernel/hotplug - fi - - /sbin/udevd --daemon - /sbin/udevtrigger - /sbin/udevsettle - -fi - -mount none /dev/pts -t devpts - -# the root mount point can come from the kernel command line -# or it can be overridden in the preinit.arch file -trap 'FAILSAFE=true' USR1 -[ -e /etc/preinit.arch ] && . /etc/preinit.arch -set_state preinit -echo "$HOTPLUG" > /proc/sys/kernel/hotplug -eval ${FAILSAFE:+failsafe} -lock -w /tmp/.failsafe +. /etc/preinit # if we have no root parameter, just go to running from ramfs [ -z $rootfs ] && { |