diff options
Diffstat (limited to 'external/poky/meta/recipes-core/busybox/files')
6 files changed, 36 insertions, 16 deletions
diff --git a/external/poky/meta/recipes-core/busybox/files/inittab b/external/poky/meta/recipes-core/busybox/files/inittab index 2bc831c7..e8ec2ab6 100644 --- a/external/poky/meta/recipes-core/busybox/files/inittab +++ b/external/poky/meta/recipes-core/busybox/files/inittab @@ -8,11 +8,17 @@ ::sysinit:/bin/mkdir -p /dev/pts ::sysinit:/bin/mount -t devpts devpts /dev/pts ::sysinit:/bin/mount -a - +::sysinit:/sbin/swapon -a +null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd +null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin +null::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout +null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr +# set hostname +null::sysinit:/bin/busybox hostname -F /etc/hostname ::sysinit:/etc/init.d/rcS # Stuff to do before rebooting -::ctrlaltdel:/sbin/reboot +#::ctrlaltdel:/sbin/reboot ::shutdown:/etc/init.d/rcK ::shutdown:/sbin/swapoff -a ::shutdown:/bin/umount -a -r @@ -20,5 +26,3 @@ # Stuff to do when restarting the init process ::restart:/sbin/init -# set hostname -null::sysinit:/bin/busybox hostname -F /etc/hostname diff --git a/external/poky/meta/recipes-core/busybox/files/mount.busybox b/external/poky/meta/recipes-core/busybox/files/mount.busybox deleted file mode 100755 index fef945b7..00000000 --- a/external/poky/meta/recipes-core/busybox/files/mount.busybox +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /bin/busybox mount $@ diff --git a/external/poky/meta/recipes-core/busybox/files/run-ptest b/external/poky/meta/recipes-core/busybox/files/run-ptest index 3608a8eb..76873c9d 100644 --- a/external/poky/meta/recipes-core/busybox/files/run-ptest +++ b/external/poky/meta/recipes-core/busybox/files/run-ptest @@ -1,7 +1,9 @@ #!/bin/sh -current_dir=$(readlink -f $0) -export bindir=$(dirname $current_dir) +current_path=$(readlink -f $0) +export bindir=$(dirname $current_path) +export PATH=$bindir/bin:$PATH +export SKIP_KNOWN_BUGS=1 cd testsuite || exit 1 -./runtest -v | sed -r 's/^(SKIPPED|UNTESTED):/SKIP:/' +LANG=C.UTF-8 ./runtest -v | sed -r 's/^(SKIPPED|UNTESTED):/SKIP:/' diff --git a/external/poky/meta/recipes-core/busybox/files/simple.script b/external/poky/meta/recipes-core/busybox/files/simple.script index 6ed02935..01344057 100644 --- a/external/poky/meta/recipes-core/busybox/files/simple.script +++ b/external/poky/meta/recipes-core/busybox/files/simple.script @@ -28,7 +28,7 @@ case "$1" in fi if ! root_is_nfs ; then if [ $have_bin_ip -eq 1 ]; then - /SBIN_DIR/ip addr flush dev $interface + /SBIN_DIR/ip -4 addr flush dev $interface /SBIN_DIR/ip link set dev $interface up else /SBIN_DIR/ifconfig $interface 0.0.0.0 @@ -59,7 +59,7 @@ case "$1" in metric=10 for i in $router ; do if [ $have_bin_ip -eq 1 ]; then - /SBIN_DIR/ip route add default via $i metric $metric + /SBIN_DIR/ip route add default via $i metric $metric dev $interface else /SBIN_DIR/route add default gw $i dev $interface metric $metric 2>/dev/null fi diff --git a/external/poky/meta/recipes-core/busybox/files/syslog b/external/poky/meta/recipes-core/busybox/files/syslog index 89c4d12e..2208613e 100644 --- a/external/poky/meta/recipes-core/busybox/files/syslog +++ b/external/poky/meta/recipes-core/busybox/files/syslog @@ -51,6 +51,22 @@ else SYSLOG_ARGS="-C" fi +waitpid () +{ + pid=$1 + # Give pid a chance to exit before we restart with a 5s timeout in 1s intervals + if [ -z "$pid" ]; then + return + fi + timeout=5; + while [ $timeout -gt 0 ] + do + timeout=$(( $timeout-1 )) + kill -0 $pid 2> /dev/null || break + sleep 1 + done +} + case "$1" in start) echo -n "Starting syslogd/klogd: " @@ -65,7 +81,11 @@ case "$1" in echo "done" ;; restart) - $0 stop + pid1=`pidof syslogd` + pid2=`pidof klogd` + $0 stop + waitpid $pid1 + waitpid $pid2 $0 start ;; *) diff --git a/external/poky/meta/recipes-core/busybox/files/umount.busybox b/external/poky/meta/recipes-core/busybox/files/umount.busybox deleted file mode 100755 index f3731626..00000000 --- a/external/poky/meta/recipes-core/busybox/files/umount.busybox +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /bin/busybox umount $@ |