mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 21:32:59 +02:00
remove some redundant code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10870 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
6598df69d1
commit
16ddb9350a
@ -59,17 +59,20 @@ set_state preinit
|
|||||||
echo "$HOTPLUG" > /proc/sys/kernel/hotplug
|
echo "$HOTPLUG" > /proc/sys/kernel/hotplug
|
||||||
eval ${FAILSAFE:+failsafe}
|
eval ${FAILSAFE:+failsafe}
|
||||||
lock -w /tmp/.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
|
killall hotplug2
|
||||||
exec /sbin/init
|
exec /sbin/init
|
||||||
|
fi
|
||||||
|
@ -1,48 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Copyright (C) 2006 OpenWrt.org
|
# Copyright (C) 2006 OpenWrt.org
|
||||||
|
|
||||||
. /etc/diag.sh
|
INITRAMFS=1
|
||||||
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
|
|
||||||
|
|
||||||
if grep devfs /proc/filesystems > /dev/null; then
|
. /etc/preinit
|
||||||
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
|
|
||||||
|
|
||||||
# if we have no root parameter, just go to running from ramfs
|
# if we have no root parameter, just go to running from ramfs
|
||||||
[ -z $rootfs ] && {
|
[ -z $rootfs ] && {
|
||||||
|
Loading…
Reference in New Issue
Block a user