projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base-files: port init.d/led to new config_get
[openwrt.git]
/
package
/
base-files
/
files
/
etc
/
preinit
diff --git
a/package/base-files/files/etc/preinit
b/package/base-files/files/etc/preinit
index
c24035e
..
4e706f1
100755
(executable)
--- a/
package/base-files/files/etc/preinit
+++ b/
package/base-files/files/etc/preinit
@@
-11,16
+11,16
@@
failsafe() {
[ -n "$ifname" ] && grep "$ifname" /proc/net/dev >/dev/null && {
failsafe_ip
netmsg 192.168.1.255 "Entering Failsafe!"
[ -n "$ifname" ] && grep "$ifname" /proc/net/dev >/dev/null && {
failsafe_ip
netmsg 192.168.1.255 "Entering Failsafe!"
- telnetd -l /bin/login <> /dev/null 2>&1
+ telnetd -l /bin/login
.sh
<> /dev/null 2>&1
}
lock /tmp/.failsafe
ash --login
}
mount proc /proc -t proc
}
lock /tmp/.failsafe
ash --login
}
mount proc /proc -t proc
-mount sysfs /sys
-t sysfs
+mount sysfs /sys -t sysfs
-size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)?mt-l:s}' /proc/meminfo)
+size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)
&&(mt>l)
?mt-l:s}' /proc/meminfo)
mount tmpfs /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
if grep devfs /proc/filesystems > /dev/null; then
mount tmpfs /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
if grep devfs /proc/filesystems > /dev/null; then
@@
-28,15
+28,24
@@
if grep devfs /proc/filesystems > /dev/null; then
M0=/dev/pty/m0
M1=/dev/pty/m1
HOTPLUG=/sbin/hotplug-call
M0=/dev/pty/m0
M1=/dev/pty/m1
HOTPLUG=/sbin/hotplug-call
-else
+
+elif [ -x /sbin/hotplug2 ]; then
mount -t tmpfs tmpfs /dev -o size=512K
mknod /dev/console c 5 1
mount -t tmpfs tmpfs /dev -o size=512K
mknod /dev/console c 5 1
- mkdir /dev/shm
- /sbin/hotplug2 --coldplug --set-rules-file /etc/hotplug2-init.rules
- /sbin/hotplug2 --no-coldplug --persistent --set-rules-file /etc/hotplug2-init.rules &
+ /sbin/hotplug2 --set-worker /lib/hotplug2/worker_fork.so --set-rules-file /etc/hotplug2-init.rules --no-persistent --set-coldplug-cmd /sbin/udevtrigger
+ /sbin/hotplug2 --set-worker /lib/hotplug2/worker_fork.so --set-rules-file /etc/hotplug2-init.rules --persistent &
M0=/dev/ptmx
M1=/dev/ptmx
HOTPLUG=
M0=/dev/ptmx
M1=/dev/ptmx
HOTPLUG=
+
+elif [ -x /sbin/udevd ]; then
+ mount -n -t tmpfs -o mode=0755 udev /dev
+ /sbin/udevd --daemon
+ /sbin/udevtrigger
+ /sbin/udevsettle
+ M0=/dev/pty/ptmx
+ M1=/dev/pty/ptmx
+ HOTPLUG=
fi
mkdir -p /dev/pts /dev/shm
fi
mkdir -p /dev/pts /dev/shm
@@
-53,10
+62,13
@@
dd if=/dev/console of=/dev/null bs=1 count=0 >/dev/null 2>/dev/null && {
exec <$M0 >$M1 2>&0
echo "- preinit -"
exec <$M0 >$M1 2>&0
echo "- preinit -"
+echo "Press CTRL-C for failsafe"
+trap 'FAILSAFE=true' INT
trap 'FAILSAFE=true' USR1
[ -e /etc/preinit.arch ] && . /etc/preinit.arch
set_state preinit
echo "$HOTPLUG" > /proc/sys/kernel/hotplug
trap 'FAILSAFE=true' USR1
[ -e /etc/preinit.arch ] && . /etc/preinit.arch
set_state preinit
echo "$HOTPLUG" > /proc/sys/kernel/hotplug
+export FAILSAFE
eval ${FAILSAFE:+failsafe}
lock -w /tmp/.failsafe
eval ${FAILSAFE:+failsafe}
lock -w /tmp/.failsafe
@@
-73,6
+85,5
@@
if [ -z "$INITRAMFS" ]; then
echo "- init -"
echo "- init -"
- killall hotplug2
exec /sbin/init
fi
exec /sbin/init
fi
This page took
0.020738 seconds
and
4
git commands to generate.