[base-files] make basefiles aware of procd
authorJohn Crispin <john@openwrt.org>
Wed, 13 Mar 2013 18:11:19 +0000 (18:11 +0000)
committerJohn Crispin <john@openwrt.org>
Wed, 13 Mar 2013 18:11:19 +0000 (18:11 +0000)
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 36003

49 files changed:
package/base-files/Makefile
package/base-files/files.old/etc/hotplug2-common.rules [new file with mode: 0644]
package/base-files/files.old/etc/hotplug2-init.rules [new file with mode: 0644]
package/base-files/files.old/etc/init.d/boot [new file with mode: 0755]
package/base-files/files.old/etc/init.d/rcS [new file with mode: 0755]
package/base-files/files.old/etc/init.d/watchdog [new file with mode: 0755]
package/base-files/files.old/etc/inittab [new file with mode: 0644]
package/base-files/files.old/etc/preinit [new file with mode: 0755]
package/base-files/files.old/etc/watchdog [new file with mode: 0755]
package/base-files/files.old/init [new file with mode: 0755]
package/base-files/files.old/lib/firstboot/99_10_with_fo_cleanup [new file with mode: 0644]
package/base-files/files.old/lib/preinit/10_essential_fs [new file with mode: 0644]
package/base-files/files.old/lib/preinit/10_indicate_preinit [new file with mode: 0644]
package/base-files/files.old/lib/preinit/20_device_fs_mount [new file with mode: 0644]
package/base-files/files.old/lib/preinit/30_device_fs_daemons [new file with mode: 0644]
package/base-files/files.old/lib/preinit/40_init_shm [new file with mode: 0644]
package/base-files/files.old/lib/preinit/40_mount_devpts [new file with mode: 0644]
package/base-files/files.old/lib/preinit/50_choose_console [new file with mode: 0644]
package/base-files/files.old/lib/preinit/50_indicate_regular_preinit [new file with mode: 0644]
package/base-files/files.old/lib/preinit/60_init_hotplug [new file with mode: 0644]
package/base-files/files.old/lib/preinit/80_mount_root [new file with mode: 0644]
package/base-files/files.old/lib/preinit/90_init_console [new file with mode: 0644]
package/base-files/files.old/lib/preinit/99_10_run_init [new file with mode: 0644]
package/base-files/files.old/lib/upgrade/common.sh [new file with mode: 0644]
package/base-files/files/etc/hotplug2-common.rules [deleted file]
package/base-files/files/etc/hotplug2-init.rules [deleted file]
package/base-files/files/etc/init.d/boot
package/base-files/files/etc/init.d/rcS
package/base-files/files/etc/init.d/watchdog [deleted file]
package/base-files/files/etc/inittab
package/base-files/files/etc/preinit
package/base-files/files/etc/rc.button/failsafe [new file with mode: 0755]
package/base-files/files/etc/rc.button/reset [new file with mode: 0755]
package/base-files/files/etc/rc.button/rfkill [new file with mode: 0755]
package/base-files/files/lib/firstboot/99_10_with_fo_cleanup
package/base-files/files/lib/preinit/10_essential_fs [deleted file]
package/base-files/files/lib/preinit/10_indicate_preinit
package/base-files/files/lib/preinit/20_device_fs_mount [deleted file]
package/base-files/files/lib/preinit/30_device_fs_daemons [deleted file]
package/base-files/files/lib/preinit/30_failsafe_wait
package/base-files/files/lib/preinit/40_init_shm [deleted file]
package/base-files/files/lib/preinit/40_mount_devpts [deleted file]
package/base-files/files/lib/preinit/50_choose_console [deleted file]
package/base-files/files/lib/preinit/50_indicate_regular_preinit
package/base-files/files/lib/preinit/60_init_hotplug [deleted file]
package/base-files/files/lib/preinit/80_mount_root
package/base-files/files/lib/preinit/90_init_console [deleted file]
package/base-files/files/lib/preinit/99_10_run_init
package/base-files/files/lib/upgrade/common.sh

index b763658..90c2806 100644 (file)
@@ -15,6 +15,7 @@ PKG_RELEASE:=134
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
+PKG_CONFIG_DEPENDS:=CONFIG_PROCD_INIT
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -55,6 +56,18 @@ define Package/base-files/description
  This package contains a base filesystem and system scripts for OpenWrt.
 endef
 
+define Package/base-files/config
+config PROCD_INIT
+       bool "Use procd as the init process"
+       default n
+endef
+
+ifeq ($(CONFIG_PROCD_INIT),)
+define InstallOldFiles
+       $(CP) ./files.old/* $(1)/
+endef
+endif
+
 ifneq ($(CONFIG_PREINITOPT),)
 define ImageConfigOptions
        mkdir -p $(1)/lib/preinit
@@ -87,6 +100,7 @@ define Package/base-files/install
        if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \
                $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \
        fi
+       $(call InstallOldFiles,$(1))
        if [ -d $(PLATFORM_DIR)/base-files/. ]; then \
                $(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \
        fi
diff --git a/package/base-files/files.old/etc/hotplug2-common.rules b/package/base-files/files.old/etc/hotplug2-common.rules
new file mode 100644 (file)
index 0000000..c284f8f
--- /dev/null
@@ -0,0 +1,43 @@
+
+# uncomment me to log hotplug events
+# DEVPATH is set {
+#      exec logger -s -t hotplug -p daemon.info "name=%DEVNAME%, path=%DEVPATH%"
+# }
+
+$include /etc/hotplug2-platform.rules
+
+DEVNAME ~~ (^null$|^full$|^ptmx$|^zero$|^gpio|^hvc) {
+       makedev /dev/%DEVNAME% 0666
+       next-event
+}
+
+DEVNAME == mapper/control {
+       makedev /dev/%DEVNAME% 0600
+       next-event
+}
+
+ACTION == add, DEVPATH is set {
+       makedev /dev/%DEVNAME% 0644
+}
+
+ACTION == add, DEVPATH is set, DEVNAME ~~ ^tty {
+       chmod 0666 /dev/%DEVNAME%
+}
+
+ACTION == add, DEVPATH is set, DEVNAME ~~ ^ppp {
+       chmod 0600 /dev/%DEVNAME%
+}
+
+ACTION == remove, DEVPATH is set, MAJOR is set, MINOR is set {
+       remove /dev/%DEVNAME%
+}
+
+FIRMWARE is set, ACTION == add {
+       exec /sbin/hotplug-call firmware
+       load-firmware /lib/firmware
+       next-event
+}
+
+SUBSYSTEM == platform {
+       exec /sbin/hotplug-call %SUBSYSTEM%
+}
diff --git a/package/base-files/files.old/etc/hotplug2-init.rules b/package/base-files/files.old/etc/hotplug2-init.rules
new file mode 100644 (file)
index 0000000..f011697
--- /dev/null
@@ -0,0 +1,5 @@
+$include /etc/hotplug2-common.rules
+
+SUBSYSTEM == button {
+       exec kill -USR1 1
+}
diff --git a/package/base-files/files.old/etc/init.d/boot b/package/base-files/files.old/etc/init.d/boot
new file mode 100755 (executable)
index 0000000..005c4ad
--- /dev/null
@@ -0,0 +1,110 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
+
+START=10
+STOP=98
+
+system_config() {
+       local cfg="$1"
+
+       local hostname conloglevel timezone
+
+       config_get hostname "$cfg" hostname 'OpenWrt'
+       echo "$hostname" > /proc/sys/kernel/hostname
+
+       config_get conloglevel "$cfg" conloglevel
+       config_get buffersize "$cfg" buffersize
+       [ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n $conloglevel} ${buffersize:+-s $buffersize}
+
+       config_get timezone "$cfg" timezone 'UTC'
+       echo "$timezone" > /tmp/TZ
+
+       config_get zonename "$cfg" zonename
+       [ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/$zonename" ] && ln -s "/usr/share/zoneinfo/$zonename" /tmp/localtime
+
+       # apply timezone to kernel
+       date -k
+
+       if [ -x /sbin/syslogd ]; then
+               local args log_ip log_size log_port log_type log_file
+               config_get log_ip "$cfg" log_ip 
+               config_get log_size "$cfg" log_size 16
+               config_get log_port "$cfg" log_port 514
+               config_get log_type "$cfg" log_type circular
+               config_get log_file "$cfg" log_file "/var/log/messages"
+               args="${log_ip:+-L -R ${log_ip}:${log_port}} ${conloglevel:+-l $conloglevel}"
+               if [ "$log_type" = "file" ]; then
+                       args="$args -s $log_size -O $log_file -S"
+               else
+                       args="$args -C${log_size}"
+               fi
+               service_start /sbin/syslogd $args
+       fi
+       if [ -x /sbin/klogd ]; then
+               config_get klogconloglevel "$cfg" klogconloglevel
+               args="${klogconloglevel:+-c $klogconloglevel}"
+               service_start /sbin/klogd $args
+       fi
+}
+
+apply_uci_config() {
+       sh -c '. /lib/functions.sh; include /lib/config; uci_apply_defaults'
+}
+
+start() {
+       [ -f /proc/mounts ] || /sbin/mount_root
+       [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
+       [ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD
+
+       mkdir -p /var/run
+       mkdir -p /var/log
+       mkdir -p /var/lock
+       mkdir -p /var/state
+       mkdir -p /tmp/.uci
+       chmod 0700 /tmp/.uci
+       touch /var/log/wtmp
+       touch /var/log/lastlog
+       touch /tmp/resolv.conf.auto
+       ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
+       grep -q debugfs /proc/filesystems && mount -o noatime -t debugfs debugfs /sys/kernel/debug
+       [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
+
+       load_modules /etc/modules.d/*
+
+       # allow wifi modules time to settle
+       sleep 1
+
+       /sbin/wifi detect > /tmp/wireless.tmp
+       [ -s /tmp/wireless.tmp ] && {
+               cat /tmp/wireless.tmp >> /etc/config/wireless
+       }
+       rm -f /tmp/wireless.tmp
+
+       apply_uci_config
+       config_load system
+       config_foreach system_config system
+
+       killall -q hotplug2
+       [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
+                       --set-rules-file /etc/hotplug2.rules \
+                       --set-coldplug-cmd /sbin/udevtrigger \
+                       --max-children 1 >/dev/null 2>&1 &
+
+       # create /dev/root if it doesn't exist
+       [ -e /dev/root -o -h /dev/root ] || {
+               rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
+               [ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
+       }
+
+       # early sysctl to avoid networking races
+       if [ -d /proc/sys/net/ipv6/conf ]; then
+               for i in /proc/sys/net/ipv6/conf/*/accept_ra; do
+                       echo 0 > $i
+               done
+       fi
+}
+
+stop() {
+       service_stop /sbin/klogd
+       service_stop /sbin/syslogd
+}
diff --git a/package/base-files/files.old/etc/init.d/rcS b/package/base-files/files.old/etc/init.d/rcS
new file mode 100755 (executable)
index 0000000..3ec9bfe
--- /dev/null
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
+run_scripts() {
+       for i in /etc/rc.d/$1*; do
+               [ -x $i ] && $i $2 2>&1
+       done | $LOGGER
+}
+
+system_config() {
+       config_get_bool foreground $1 foreground 0
+}
+
+LOGGER="cat"
+[ -x /usr/bin/logger ] && LOGGER="logger -s -p 6 -t sysinit"
+
+. /lib/functions.sh
+
+config_load system
+config_foreach system_config system
+
+if [ "$1" = "S" -a "$foreground" != "1" ]; then
+       run_scripts "$1" "$2" &
+else
+       run_scripts "$1" "$2"
+fi
diff --git a/package/base-files/files.old/etc/init.d/watchdog b/package/base-files/files.old/etc/init.d/watchdog
new file mode 100755 (executable)
index 0000000..299c891
--- /dev/null
@@ -0,0 +1,13 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008-2011 OpenWrt.org
+
+START=97
+
+start() {
+       [ -c /dev/watchdog ] || return 1
+       [ -x /sbin/watchdog ] || return 1
+       service_start /sbin/watchdog -t 5 /dev/watchdog
+}
+stop() {
+       service_stop /sbin/watchdog
+}
diff --git a/package/base-files/files.old/etc/inittab b/package/base-files/files.old/etc/inittab
new file mode 100644 (file)
index 0000000..ca90fd8
--- /dev/null
@@ -0,0 +1,4 @@
+::sysinit:/etc/init.d/rcS S boot
+::shutdown:/etc/init.d/rcS K shutdown
+ttyS0::askfirst:/bin/ash --login
+tty1::askfirst:/bin/ash --login
diff --git a/package/base-files/files.old/etc/preinit b/package/base-files/files.old/etc/preinit
new file mode 100755 (executable)
index 0000000..b237c2e
--- /dev/null
@@ -0,0 +1,43 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+
+pi_ifname=
+pi_ip=192.168.1.1
+pi_broadcast=192.168.1.255
+pi_netmask=255.255.255.0
+
+fs_failsafe_ifname=
+fs_failsafe_ip=192.168.1.1
+fs_failsafe_broadcast=192.168.1.255
+fs_failsafe_netmask=255.255.255.0
+
+fs_failsafe_wait_timeout=2
+
+pi_suppress_stderr="y"
+pi_init_suppress_stderr="y"
+pi_init_path="/bin:/sbin:/usr/bin:/usr/sbin"
+pi_init_cmd="/sbin/init"
+
+. /lib/functions.sh
+
+boot_hook_init preinit_essential
+boot_hook_init preinit_main
+boot_hook_init failsafe
+boot_hook_init initramfs
+boot_hook_init preinit_mount_root
+
+for pi_source_file in /lib/preinit/*; do
+    . $pi_source_file
+done
+
+boot_run_hook preinit_essential
+
+pi_mount_skip_next=false
+pi_jffs2_mount_success=false
+pi_failsafe_net_message=false
+
+boot_run_hook preinit_main
+
diff --git a/package/base-files/files.old/etc/watchdog b/package/base-files/files.old/etc/watchdog
new file mode 100755 (executable)
index 0000000..299c891
--- /dev/null
@@ -0,0 +1,13 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008-2011 OpenWrt.org
+
+START=97
+
+start() {
+       [ -c /dev/watchdog ] || return 1
+       [ -x /sbin/watchdog ] || return 1
+       service_start /sbin/watchdog -t 5 /dev/watchdog
+}
+stop() {
+       service_stop /sbin/watchdog
+}
diff --git a/package/base-files/files.old/init b/package/base-files/files.old/init
new file mode 100755 (executable)
index 0000000..b4ef4fe
--- /dev/null
@@ -0,0 +1,96 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
+INITRAMFS=1
+
+. /etc/preinit
+
+set_state init
+echo "- init -"
+
+[ -n "$SWITCH_ROOT_TMPFS" ] && {
+  mount -o noatime none /mnt -t tmpfs
+  ( cd /; find -xdev -type d ) | ( cd /mnt; xargs mkdir -p )
+  find / \! -type d -xdev | tar -cT /proc/self/fd/0 | tar -xC /mnt
+  mkdir /mnt/proc /mnt/dev /mnt/tmp /mnt/sys
+  mount -o noatime,move /proc /mnt/proc
+  mount -o noatime,move /dev /mnt/dev
+  mount -o noatime,move /tmp /mnt/tmp
+  mount -o noatime,move /sys /mnt/sys
+  rm -rf /proc /dev /tmp /sys
+  exec switch_root -c /dev/console /mnt /sbin/init
+}
+
+# if we have no root parameter, just go to running from ramfs
+[ -z $rootfs ] && {
+  export NOMOUNT="No Root"
+  exec /sbin/init
+}
+
+#if we have a failsafe boot selected, dont bother
+#trying to find or wait for a root mount point
+[ -z "$FAILSAFE" ] || {
+  exec /bin/busybox init
+}
+
+# Load the modules we have in initramfs, this should
+# make the media accessible, but, it may take some time
+. /lib/functions.sh
+load_modules /etc/modules /etc/modules.d/*
+
+#wait 10 seconds for the disc to show up
+#usb stick typically takes 4 to 6 seconds
+#till it's readable
+#it's quite possible the disc never shows up
+#if we netbooted this kernel
+COUNTER=0
+while [ $COUNTER -lt 10 ]; do
+  sleep 1
+  [ -e $rootfs ] && let COUNTER=10;
+  let COUNTER=COUNTER+1
+done
+[ -e $rootfs ] || {
+  export FAILSAFE="NoDisc"
+  exec /bin/busybox init
+}
+
+# now we'll try mount it, again with a timeout
+# This will fail if the inserted stick is formatted
+# in a manner we dont understand
+COUNTER=0
+while [ $COUNTER -lt 10 ]; do
+  sleep 1
+  mount -o noatime $rootfs /mnt
+  [ $? -eq "0" ] && let COUNTER=100;
+  let COUNTER=COUNTER+1
+done
+[ $? -ne "0" ] && {
+  export FAILSAFE="MountFail"
+  exec /bin/busybox init
+}
+
+#It mounted, lets look for a postinit file, again, give it time
+#I've seen this take 6 seconds to actually complete
+COUNTER=0
+while [ $COUNTER -lt 10 ]; do
+  sleep 1
+  [ -e /mnt/etc/banner ] && let COUNTER=10;
+  let COUNTER=COUNTER+1
+done
+[ -e /mnt/etc/banner ] || {
+  export FAILSAFE="No Openwrt FS"
+  exec /bin/busybox init
+}
+
+unset rootfs
+
+mount -o noatime,move /proc /mnt/proc
+mount -o noatime,move /dev /mnt/dev
+mount -o noatime,move /dev/pts /mnt/dev/pts
+mount -o noatime,move /tmp /mnt/tmp
+mount -o noatime,move /sys /mnt/sys
+mount -o noatime none /tmp -t tmpfs
+killall -q hotplug2
+exec switch_root -c /dev/console /mnt /sbin/init
+
+set_state done
diff --git a/package/base-files/files.old/lib/firstboot/99_10_with_fo_cleanup b/package/base-files/files.old/lib/firstboot/99_10_with_fo_cleanup
new file mode 100644 (file)
index 0000000..0181b39
--- /dev/null
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+with_fo_cleanup() {
+    # try to get rid of /tmp/root
+    # this will almost always fail
+    umount /tmp/root 2>&-
+       grep -q overlay /proc/filesystems && {
+               cd /
+               (
+                       cd /overlay
+                       find -type l
+               ) | while read FILE; do
+                       [ -z "$FILE" ] && break
+                       if ls -la "$FILE" 2>&- | grep -q '(overlay-whiteout)'; then
+                               rm -f "$FILE"
+                       fi
+               done
+       }
+    exit 0
+}
+
+boot_hook_add switch2jffs with_fo_cleanup
diff --git a/package/base-files/files.old/lib/preinit/10_essential_fs b/package/base-files/files.old/lib/preinit/10_essential_fs
new file mode 100644 (file)
index 0000000..fc04eb7
--- /dev/null
@@ -0,0 +1,25 @@
+#!/bin/sh 
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+do_mount_procfs() {
+   mount -o noatime -t proc proc /proc
+}
+
+do_mount_sysfs() {
+   mount -o noatime -tsysfs sysfs /sys
+}
+
+calc_tmpfs_size() {
+    pi_size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)&&(mt>l)?mt-l:s}' /proc/meminfo)
+}
+
+do_mount_tmpfs() {
+    calc_tmpfs_size
+    mount -o noatime -t tmpfs -o size=$pi_size,nosuid,nodev,mode=1777 tmpfs /tmp
+}
+
+boot_hook_add preinit_essential do_mount_procfs
+boot_hook_add preinit_essential do_mount_sysfs
+boot_hook_add preinit_essential do_mount_tmpfs
+
diff --git a/package/base-files/files.old/lib/preinit/10_indicate_preinit b/package/base-files/files.old/lib/preinit/10_indicate_preinit
new file mode 100644 (file)
index 0000000..4a0109c
--- /dev/null
@@ -0,0 +1,51 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+preinit_ip() {
+    # if the preinit interface isn't specified and ifname is set in 
+    # preinit.arch use that interface
+    if [ -z "$pi_ifname" ]; then
+       pi_ifname=$ifname    
+    fi
+
+    [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
+       ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up
+    }
+}
+
+preinit_ip_deconfig() {
+    [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
+       ifconfig $pi_ifname 0.0.0.0 down
+    }
+}
+
+preinit_net_echo() {
+       [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && {
+               { 
+                       [ "$pi_preinit_net_messages" = "y" ] || {
+                               [ "$pi_failsafe_net_message"  = "true" ] && 
+                                   [ "$pi_preinit_no_failsafe_netmsg" != "y" ] 
+                        }
+               } && netmsg $pi_broadcast "$1"
+       }
+}
+
+preinit_echo() {
+    preinit_net_echo $1
+    echo $1
+}
+
+pi_indicate_led() {
+    set_state preinit
+}
+
+pi_indicate_preinit() {
+    echo "- preinit -"
+    preinit_net_echo "Doing OpenWRT Preinit\n"
+    pi_indicate_led
+}
+
+boot_hook_add preinit_main preinit_ip
+boot_hook_add preinit_main pi_indicate_preinit
+
diff --git a/package/base-files/files.old/lib/preinit/20_device_fs_mount b/package/base-files/files.old/lib/preinit/20_device_fs_mount
new file mode 100644 (file)
index 0000000..7535b3f
--- /dev/null
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+do_move_devtmpfs() {
+    local mnt="$(grep devtmpfs /proc/mounts)"
+          mnt="${mnt#* }"; mnt="${mnt%% *}"
+
+    [ "$mnt" = "/dev" ] || mount -o noatime,move "$mnt" /dev
+}
+
+do_mount_devfs() {
+    mount -o noatime -t devfs devfs /dev
+}
+
+do_mount_hotplug() {
+    mount -t tmpfs -o noatime,mode=0755,size=512K tmpfs /dev
+}
+
+do_mount_udev() {
+    mount -n -t tmpfs -o noatime,mode=0755 udev /dev
+}
+
+choose_device_fs() {
+    if grep -q devtmpfs /proc/mounts; then
+       do_move_devtmpfs
+    elif grep -q devfs /proc/filesystems; then
+        do_mount_devfs
+    elif [ -x /sbin/hotplug2 ]; then
+        do_mount_hotplug
+    elif [ -x /sbin/udevd ]; then
+        do_mount_udev
+    fi
+}
+
+boot_hook_add preinit_essential choose_device_fs
+
diff --git a/package/base-files/files.old/lib/preinit/30_device_fs_daemons b/package/base-files/files.old/lib/preinit/30_device_fs_daemons
new file mode 100644 (file)
index 0000000..8379e5e
--- /dev/null
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+init_devfs() {
+    HOTPLUG=/sbin/hotplug-call
+}
+
+init_hotplug2() {
+    [ -c /dev/console ] || mknod /dev/console c 5 1
+    /sbin/hotplug2 --set-rules-file /etc/hotplug2-init.rules --no-persistent --set-coldplug-cmd /sbin/udevtrigger
+    /sbin/hotplug2 --set-rules-file /etc/hotplug2-init.rules --persistent &
+}
+
+init_udev() {
+    [ -d /lib/udev/devices ] && cp -af /lib/udev/devices/* /dev/
+    [ -c /dev/console ] || mknod -m 0600 /dev/console c 5 1
+    [ -c /dev/null ] || mknod -m 0666 /dev/null c 1 3
+    /sbin/udevd --daemon --resolve-names=never
+    /sbin/udevadm trigger
+    /sbin/udevadm settle    
+}
+
+init_device_fs() {
+    HOTPLUG=
+    if grep -q devfs /proc/filesystems; then
+       init_devfs
+    elif [ -x /sbin/hotplug2 ]; then
+       init_hotplug2
+    elif [ -x /sbin/udevd ]; then
+       init_udev
+    fi
+}
+
+boot_hook_add preinit_essential init_device_fs
+
diff --git a/package/base-files/files.old/lib/preinit/40_init_shm b/package/base-files/files.old/lib/preinit/40_init_shm
new file mode 100644 (file)
index 0000000..8971116
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+init_shm() {
+    [ -d /dev/shm ] || mkdir -p /dev/shm
+}
+
+boot_hook_add preinit_essential init_shm
+
diff --git a/package/base-files/files.old/lib/preinit/40_mount_devpts b/package/base-files/files.old/lib/preinit/40_mount_devpts
new file mode 100644 (file)
index 0000000..b55a7f2
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+init_devpts() {
+    [ -d /dev/pts ] || mkdir -p /dev/pts
+}
+
+do_mount_devpts() {
+    mount -o noatime -t devpts devpts /dev/pts
+}
+
+boot_hook_add preinit_essential init_devpts
+boot_hook_add preinit_essential do_mount_devpts
+
diff --git a/package/base-files/files.old/lib/preinit/50_choose_console b/package/base-files/files.old/lib/preinit/50_choose_console
new file mode 100644 (file)
index 0000000..ecbc2ea
--- /dev/null
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+choose_console() {
+    # the shell really doesn't like having stdin/out closed
+    # that's why we use /dev/pty/m0 and m1 (or equivalent) as replacement
+    # for /dev/console if there's no serial console available
+
+    if grep -q devfs /proc/filesystems; then
+       M0=/dev/pty/m0
+       M1=/dev/pty/m1
+       M2=/dev/pty/m1
+    elif [ -x /sbin/hotplug2 ]; then
+       M0=/dev/ptmx
+       M1=/dev/ptmx
+       M2=/dev/ptmx
+    elif [ -x /sbin/udevd ]; then
+       M0=/dev/pty/ptmx
+       M1=/dev/pty/ptmx
+       M2=/dev/pty/ptmx
+    fi
+    dd if=/dev/console of=/dev/null bs=1 count=0 >/dev/null 2>/dev/null && {
+       M0=/dev/console
+       M1=/dev/console
+       M2=/dev/console    
+    }
+}
+
+boot_hook_add preinit_essential choose_console
+
diff --git a/package/base-files/files.old/lib/preinit/50_indicate_regular_preinit b/package/base-files/files.old/lib/preinit/50_indicate_regular_preinit
new file mode 100644 (file)
index 0000000..9cc01f2
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+indicate_regular_preinit() {
+    echo "- regular preinit -"
+    preinit_net_echo "Continuing with Regular Preinit\n"
+    pi_indicate_led
+}
+
+boot_hook_add preinit_main indicate_regular_preinit
+
diff --git a/package/base-files/files.old/lib/preinit/60_init_hotplug b/package/base-files/files.old/lib/preinit/60_init_hotplug
new file mode 100644 (file)
index 0000000..dc05e0e
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+init_hotplug() {
+   echo "$HOTPLUG" > /proc/sys/kernel/hotplug
+}
+
+boot_hook_add preinit_main init_hotplug
+
diff --git a/package/base-files/files.old/lib/preinit/80_mount_root b/package/base-files/files.old/lib/preinit/80_mount_root
new file mode 100644 (file)
index 0000000..ad24fb8
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+do_mount_root() {
+    boot_run_hook preinit_mount_root
+}
+
+boot_hook_add preinit_main do_mount_root
+
diff --git a/package/base-files/files.old/lib/preinit/90_init_console b/package/base-files/files.old/lib/preinit/90_init_console
new file mode 100644 (file)
index 0000000..ca05755
--- /dev/null
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+init_console() {
+    if [ "$pi_suppress_stderr" = "y" ]; then
+       exec <$M0 >$M1 2>&0
+    else 
+       exec <$M0 >$M1 2>$M2
+    fi
+}
+
+boot_hook_add preinit_essential init_console
+
diff --git a/package/base-files/files.old/lib/preinit/99_10_run_init b/package/base-files/files.old/lib/preinit/99_10_run_init
new file mode 100644 (file)
index 0000000..fef3a50
--- /dev/null
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
+
+run_init() {
+    preinit_echo "- init -"
+    preinit_ip_deconfig
+    if [ "$pi_init_suppress_stderr" = "y" ]; then
+       exec env - PATH=$pi_init_path $pi_init_env $pi_init_cmd 2>&0
+    else
+       exec env - PATH=$pi_init_path $pi_init_env $pi_init_cmd
+    fi
+}
+
+boot_hook_add preinit_main run_init
+
diff --git a/package/base-files/files.old/lib/upgrade/common.sh b/package/base-files/files.old/lib/upgrade/common.sh
new file mode 100644 (file)
index 0000000..2e123ab
--- /dev/null
@@ -0,0 +1,230 @@
+#!/bin/sh
+
+RAM_ROOT=/tmp/root
+
+ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
+libs() { ldd $* | awk '{print $3}'; }
+
+install_file() { # <file> [ <file> ... ]
+       for file in "$@"; do
+               dest="$RAM_ROOT/$file"
+               [ -f $file -a ! -f $dest ] && {
+                       dir="$(dirname $dest)"
+                       mkdir -p "$dir"
+                       cp $file $dest
+               }
+       done
+}
+
+install_bin() { # <file> [ <symlink> ... ]
+       src=$1
+       files=$1
+       [ -x "$src" ] && files="$src $(libs $src)"
+       install_file $files
+       [ -e /lib/ld-linux.so.3 ] && {
+               install_file /lib/ld-linux.so.3
+       }
+       shift
+       for link in "$@"; do {
+               dest="$RAM_ROOT/$link"
+               dir="$(dirname $dest)"
+               mkdir -p "$dir"
+               [ -f "$dest" ] || ln -s $src $dest
+       }; done
+}
+
+supivot() { # <new_root> <old_root>
+       mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1
+       mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
+       mount -o noatime,move /proc $1/proc && \
+       pivot_root $1 $1$2 || {
+        umount $1 $1
+               return 1
+       }
+
+       mount -o noatime,move $2/sys /sys
+       mount -o noatime,move $2/dev /dev
+       mount -o noatime,move $2/tmp /tmp
+       mount -o noatime,move $2/overlay /overlay 2>&-
+       return 0
+}
+
+run_ramfs() { # <command> [...]
+       install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount        \
+               /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd   \
+               /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" \
+               /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump          \
+               /bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc
+
+       install_bin /sbin/mtd
+       for file in $RAMFS_COPY_BIN; do
+               install_bin $file
+       done
+       install_file /etc/resolv.conf /lib/functions.sh /lib/functions.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA
+
+       supivot $RAM_ROOT /mnt || {
+               echo "Failed to switch over to ramfs. Please reboot."
+               exit 1
+       }
+
+       mount -o remount,ro /mnt
+       umount -l /mnt
+
+       grep /overlay /proc/mounts > /dev/null && {
+               mount -o noatime,remount,ro /overlay
+               umount -l /overlay
+       }
+
+       # spawn a new shell from ramdisk to reduce the probability of cache issues
+       exec /bin/busybox ash -c "$*"
+}
+
+kill_remaining() { # [ <signal> ]
+       local sig="${1:-TERM}"
+       echo -n "Sending $sig to remaining processes ... "
+
+       local stat
+       for stat in /proc/[0-9]*/stat; do
+               [ -f "$stat" ] || continue
+
+               local pid name state ppid rest
+               read pid name state ppid rest < $stat
+               name="${name#(}"; name="${name%)}"
+
+               local cmdline
+               read cmdline < /proc/$pid/cmdline
+
+               # Skip kernel threads 
+               [ -n "$cmdline" ] || continue
+
+               case "$name" in
+                       # Skip essential services
+                       *ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*|*hostapd*|*wpa_supplicant*) : ;;
+
+                       # Killable process
+                       *)
+                               if [ $pid -ne $$ ] && [ $ppid -ne $$ ]; then
+                                       echo -n "$name "
+                                       kill -$sig $pid 2>/dev/null
+                               fi
+                       ;;
+               esac
+       done
+       echo ""
+}
+
+run_hooks() {
+       local arg="$1"; shift
+       for func in "$@"; do
+               eval "$func $arg"
+       done
+}
+
+ask_bool() {
+       local default="$1"; shift;
+       local answer="$default"
+
+       [ "$INTERACTIVE" -eq 1 ] && {
+               case "$default" in
+                       0) echo -n "$* (y/N): ";;
+                       *) echo -n "$* (Y/n): ";;
+               esac
+               read answer
+               case "$answer" in
+                       y*) answer=1;;
+                       n*) answer=0;;
+                       *) answer="$default";;
+               esac
+       }
+       [ "$answer" -gt 0 ]
+}
+
+v() {
+       [ "$VERBOSE" -ge 1 ] && echo "$@"
+}
+
+rootfs_type() {
+       mount | awk '($3 ~ /^\/$/) && ($5 !~ /rootfs/) { print $5 }'
+}
+
+get_image() { # <source> [ <command> ]
+       local from="$1"
+       local conc="$2"
+       local cmd
+
+       case "$from" in
+               http://*|ftp://*) cmd="wget -O- -q";;
+               *) cmd="cat";;
+       esac
+       if [ -z "$conc" ]; then
+               local magic="$(eval $cmd $from | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')"
+               case "$magic" in
+                       1f8b) conc="zcat";;
+                       425a) conc="bzcat";;
+               esac
+       fi
+
+       eval "$cmd $from ${conc:+| $conc}"
+}
+
+get_magic_word() {
+       get_image "$@" | dd bs=2 count=1 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"'
+}
+
+get_magic_long() {
+       get_image "$@" | dd bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
+refresh_mtd_partitions() {
+       mtd refresh rootfs
+}
+
+jffs2_copy_config() {
+       if grep rootfs_data /proc/mtd >/dev/null; then
+               # squashfs+jffs2
+               mtd -e rootfs_data jffs2write "$CONF_TAR" rootfs_data
+       else
+               # jffs2
+               mtd jffs2write "$CONF_TAR" rootfs
+       fi
+}
+
+default_do_upgrade() {
+       sync
+       if [ "$SAVE_CONFIG" -eq 1 -a -z "$USE_REFRESH" ]; then
+               get_image "$1" | mtd -j "$CONF_TAR" write - "${PART_NAME:-image}"
+       else
+               get_image "$1" | mtd write - "${PART_NAME:-image}"
+       fi
+}
+
+do_upgrade() {
+       v "Performing system upgrade..."
+       if type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
+               platform_do_upgrade "$ARGV"
+       else
+               default_do_upgrade "$ARGV"
+       fi
+
+       [ "$SAVE_CONFIG" -eq 1 -a -n "$USE_REFRESH" ] && {
+               v "Refreshing partitions"
+               if type 'platform_refresh_partitions' >/dev/null 2>/dev/null; then
+                       platform_refresh_partitions
+               else
+                       refresh_mtd_partitions
+               fi
+               if type 'platform_copy_config' >/dev/null 2>/dev/null; then
+                       platform_copy_config
+               else
+                       jffs2_copy_config
+               fi
+       }
+       v "Upgrade completed"
+       [ -n "$DELAY" ] && sleep "$DELAY"
+       ask_bool 1 "Reboot" && {
+               v "Rebooting system..."
+               reboot -f
+               sleep 5
+               echo b 2>/dev/null >/proc/sysrq-trigger
+       }
+}
diff --git a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules
deleted file mode 100644 (file)
index c284f8f..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# uncomment me to log hotplug events
-# DEVPATH is set {
-#      exec logger -s -t hotplug -p daemon.info "name=%DEVNAME%, path=%DEVPATH%"
-# }
-
-$include /etc/hotplug2-platform.rules
-
-DEVNAME ~~ (^null$|^full$|^ptmx$|^zero$|^gpio|^hvc) {
-       makedev /dev/%DEVNAME% 0666
-       next-event
-}
-
-DEVNAME == mapper/control {
-       makedev /dev/%DEVNAME% 0600
-       next-event
-}
-
-ACTION == add, DEVPATH is set {
-       makedev /dev/%DEVNAME% 0644
-}
-
-ACTION == add, DEVPATH is set, DEVNAME ~~ ^tty {
-       chmod 0666 /dev/%DEVNAME%
-}
-
-ACTION == add, DEVPATH is set, DEVNAME ~~ ^ppp {
-       chmod 0600 /dev/%DEVNAME%
-}
-
-ACTION == remove, DEVPATH is set, MAJOR is set, MINOR is set {
-       remove /dev/%DEVNAME%
-}
-
-FIRMWARE is set, ACTION == add {
-       exec /sbin/hotplug-call firmware
-       load-firmware /lib/firmware
-       next-event
-}
-
-SUBSYSTEM == platform {
-       exec /sbin/hotplug-call %SUBSYSTEM%
-}
diff --git a/package/base-files/files/etc/hotplug2-init.rules b/package/base-files/files/etc/hotplug2-init.rules
deleted file mode 100644 (file)
index f011697..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-$include /etc/hotplug2-common.rules
-
-SUBSYSTEM == button {
-       exec kill -USR1 1
-}
index 005c4ad..67db0d2 100755 (executable)
@@ -24,27 +24,6 @@ system_config() {
 
        # apply timezone to kernel
        date -k
-
-       if [ -x /sbin/syslogd ]; then
-               local args log_ip log_size log_port log_type log_file
-               config_get log_ip "$cfg" log_ip 
-               config_get log_size "$cfg" log_size 16
-               config_get log_port "$cfg" log_port 514
-               config_get log_type "$cfg" log_type circular
-               config_get log_file "$cfg" log_file "/var/log/messages"
-               args="${log_ip:+-L -R ${log_ip}:${log_port}} ${conloglevel:+-l $conloglevel}"
-               if [ "$log_type" = "file" ]; then
-                       args="$args -s $log_size -O $log_file -S"
-               else
-                       args="$args -C${log_size}"
-               fi
-               service_start /sbin/syslogd $args
-       fi
-       if [ -x /sbin/klogd ]; then
-               config_get klogconloglevel "$cfg" klogconloglevel
-               args="${klogconloglevel:+-c $klogconloglevel}"
-               service_start /sbin/klogd $args
-       fi
 }
 
 apply_uci_config() {
@@ -84,12 +63,6 @@ start() {
        config_load system
        config_foreach system_config system
 
-       killall -q hotplug2
-       [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
-                       --set-rules-file /etc/hotplug2.rules \
-                       --set-coldplug-cmd /sbin/udevtrigger \
-                       --max-children 1 >/dev/null 2>&1 &
-
        # create /dev/root if it doesn't exist
        [ -e /dev/root -o -h /dev/root ] || {
                rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
@@ -103,8 +76,3 @@ start() {
                done
        fi
 }
-
-stop() {
-       service_stop /sbin/klogd
-       service_stop /sbin/syslogd
-}
index 3ec9bfe..9599bbf 100755 (executable)
@@ -1,26 +1,9 @@
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
 
-run_scripts() {
-       for i in /etc/rc.d/$1*; do
-               [ -x $i ] && $i $2 2>&1
-       done | $LOGGER
-}
-
-system_config() {
-       config_get_bool foreground $1 foreground 0
-}
-
 LOGGER="cat"
-[ -x /usr/bin/logger ] && LOGGER="logger -s -p 6 -t sysinit"
-
-. /lib/functions.sh
-
-config_load system
-config_foreach system_config system
+[ -x /usr/bin/logger ] && LOGGER="logger -p 6 -t sysinit"
 
-if [ "$1" = "S" -a "$foreground" != "1" ]; then
-       run_scripts "$1" "$2" &
-else
-       run_scripts "$1" "$2"
-fi
+for i in /etc/rc.d/$1*; do
+       [ -x $i ] && $i $2 2>&1
+done | $LOGGER
diff --git a/package/base-files/files/etc/init.d/watchdog b/package/base-files/files/etc/init.d/watchdog
deleted file mode 100755 (executable)
index 299c891..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2011 OpenWrt.org
-
-START=97
-
-start() {
-       [ -c /dev/watchdog ] || return 1
-       [ -x /sbin/watchdog ] || return 1
-       service_start /sbin/watchdog -t 5 /dev/watchdog
-}
-stop() {
-       service_stop /sbin/watchdog
-}
index ca90fd8..7817185 100644 (file)
@@ -1,4 +1,3 @@
 ::sysinit:/etc/init.d/rcS S boot
 ::shutdown:/etc/init.d/rcS K shutdown
-ttyS0::askfirst:/bin/ash --login
-tty1::askfirst:/bin/ash --login
+::askconsole:/bin/ash --login
index b237c2e..ff26f96 100755 (executable)
@@ -2,6 +2,8 @@
 # Copyright (C) 2006 OpenWrt.org
 # Copyright (C) 2010 Vertical Communications
 
+[ -z "$PREINIT" ] && exec /sbin/init
+
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
 pi_ifname=
diff --git a/package/base-files/files/etc/rc.button/failsafe b/package/base-files/files/etc/rc.button/failsafe
new file mode 100755 (executable)
index 0000000..dcdf7de
--- /dev/null
@@ -0,0 +1,2 @@
+#!/bin/sh
+touch /tmp/failsafe_button
diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset
new file mode 100755 (executable)
index 0000000..763994d
--- /dev/null
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+[ "${ACTION}" = "released" ] || exit 0
+
+. /lib/functions.sh
+
+logger "$BUTTON pressed for $SEEN seconds"
+
+if [ "$SEEN" -lt 1 ]
+then
+       echo "REBOOT" > /dev/console
+       sync
+       reboot
+elif [ "$SEEN" -gt 5 ]
+then
+       echo "FACTORY RESET" > /dev/console
+       firstboot && reboot &
+fi
diff --git a/package/base-files/files/etc/rc.button/rfkill b/package/base-files/files/etc/rc.button/rfkill
new file mode 100755 (executable)
index 0000000..7a8cfe9
--- /dev/null
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+[ "${ACTION}" = "released" ] || exit 0
+
+. /lib/functions.sh
+
+local rfkill_state=0
+
+wifi_rfkill_set() {
+       uci set wireless.$1.disabled=$rfkill_state
+}
+
+wifi_rfkill_check() {
+       local disabled
+       config_get disabled $1 disabled
+       [ "$disabled" = "1" ] || rfkill_state=1
+}
+
+config_load wireless
+config_foreach wifi_rfkill_check wifi-device
+config_foreach wifi_rfkill_set wifi-device
+uci commit wireless
+wifi up
index 0181b39..5601699 100644 (file)
@@ -6,7 +6,7 @@
 with_fo_cleanup() {
     # try to get rid of /tmp/root
     # this will almost always fail
-    umount /tmp/root 2>&-
+    umount -l /tmp/root 2>&-
        grep -q overlay /proc/filesystems && {
                cd /
                (
diff --git a/package/base-files/files/lib/preinit/10_essential_fs b/package/base-files/files/lib/preinit/10_essential_fs
deleted file mode 100644 (file)
index fc04eb7..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh 
-# Copyright (C) 2006 OpenWrt.org
-# Copyright (C) 2010 Vertical Communications
-
-do_mount_procfs() {
-   mount -o noatime -t proc proc /proc
-}
-
-do_mount_sysfs() {
-   mount -o noatime -tsysfs sysfs /sys
-}
-
-calc_tmpfs_size() {
-    pi_size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)<l)&&(mt>l)?mt-l:s}' /proc/meminfo)
-}
-
-do_mount_tmpfs() {
-    calc_tmpfs_size
-    mount -o noatime -t tmpfs -o size=$pi_size,nosuid,nodev,mode=1777 tmpfs /tmp
-}
-
-boot_hook_add preinit_essential do_mount_procfs
-boot_hook_add preinit_essential do_mount_sysfs
-boot_hook_add preinit_essential do_mount_tmpfs
-
index 4a0109c..da70b97 100644 (file)
@@ -41,7 +41,6 @@ pi_indicate_led() {
 }
 
 pi_indicate_preinit() {
-    echo "- preinit -"
     preinit_net_echo "Doing OpenWRT Preinit\n"
     pi_indicate_led
 }
diff --git a/package/base-files/files/lib/preinit/20_device_fs_mount b/package/base-files/files/lib/preinit/20_device_fs_mount
deleted file mode 100644 (file)
index 7535b3f..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-# Copyright (C) 2010 Vertical Communications
-
-do_move_devtmpfs() {
-    local mnt="$(grep devtmpfs /proc/mounts)"
-          mnt="${mnt#* }"; mnt="${mnt%% *}"
-
-    [ "$mnt" = "/dev" ] || mount -o noatime,move "$mnt" /dev
-}
-
-do_mount_devfs() {
-    mount -o noatime -t devfs devfs /dev
-}
-
-do_mount_hotplug() {
-    mount -t tmpfs -o noatime,mode=0755,size=512K tmpfs /dev
-}
-
-do_mount_udev() {
-    mount -n -t tmpfs -o noatime,mode=0755 udev /dev
-}
-
-choose_device_fs() {
-    if grep -q devtmpfs /proc/mounts; then
-       do_move_devtmpfs
-    elif grep -q devfs /proc/filesystems; then
-        do_mount_devfs
-    elif [ -x /sbin/hotplug2 ]; then
-        do_mount_hotplug
-    elif [ -x /sbin/udevd ]; then
-        do_mount_udev
-    fi
-}
-
-boot_hook_add preinit_essential choose_device_fs
-
diff --git a/package/base-files/files/lib/preinit/30_device_fs_daemons b/package/base-files/files/lib/preinit/30_device_fs_daemons
deleted file mode 100644 (file)
index 8379e5e..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006-2013 OpenWrt.org
-# Copyright (C) 2010 Vertical Communications
-
-init_devfs() {
-    HOTPLUG=/sbin/hotplug-call
-}
-
-init_hotplug2() {
-    [ -c /dev/console ] || mknod /dev/console c 5 1
-    /sbin/hotplug2 --set-rules-file /etc/hotplug2-init.rules --no-persistent --set-coldplug-cmd /sbin/udevtrigger
-    /sbin/hotplug2 --set-rules-file /etc/hotplug2-init.rules --persistent &
-}
-
-init_udev() {
-    [ -d /lib/udev/devices ] && cp -af /lib/udev/devices/* /dev/
-    [ -c /dev/console ] || mknod -m 0600 /dev/console c 5 1
-    [ -c /dev/null ] || mknod -m 0666 /dev/null c 1 3
-    /sbin/udevd --daemon --resolve-names=never
-    /sbin/udevadm trigger
-    /sbin/udevadm settle    
-}
-
-init_device_fs() {
-    HOTPLUG=
-    if grep -q devfs /proc/filesystems; then
-       init_devfs
-    elif [ -x /sbin/hotplug2 ]; then
-       init_hotplug2
-    elif [ -x /sbin/udevd ]; then
-       init_udev
-    fi
-}
-
-boot_hook_add preinit_essential init_device_fs
-
index 04dc57d..808d973 100644 (file)
@@ -61,11 +61,10 @@ fs_wait_for_key () {
     }
     lock -w $keypress_wait
 
-    trap - INT
-    trap - USR1
-
     keypressed=1
     [ "$(cat $keypress_true)" = "true" ] && keypressed=0
+    [ -f "/tmp/failsafe_button" ] && keypressed=1
+    
     rm -f $keypress_true
     rm -f $keypress_wait
     rm -f $keypress_sec
diff --git a/package/base-files/files/lib/preinit/40_init_shm b/package/base-files/files/lib/preinit/40_init_shm
deleted file mode 100644 (file)
index 8971116..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-# Copyright (C) 2010 Vertical Communications
-
-init_shm() {
-    [ -d /dev/shm ] || mkdir -p /dev/shm
-}
-
-boot_hook_add preinit_essential init_shm
-
diff --git a/package/base-files/files/lib/preinit/40_mount_devpts b/package/base-files/files/lib/preinit/40_mount_devpts
deleted file mode 100644 (file)
index b55a7f2..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-# Copyright (C) 2010 Vertical Communications
-
-init_devpts() {
-    [ -d /dev/pts ] || mkdir -p /dev/pts
-}
-
-do_mount_devpts() {
-    mount -o noatime -t devpts devpts /dev/pts
-}
-
-boot_hook_add preinit_essential init_devpts
-boot_hook_add preinit_essential do_mount_devpts
-
diff --git a/package/base-files/files/lib/preinit/50_choose_console b/package/base-files/files/lib/preinit/50_choose_console
deleted file mode 100644 (file)
index ecbc2ea..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006-2010 OpenWrt.org
-# Copyright (C) 2010 Vertical Communications
-
-choose_console() {
-    # the shell really doesn't like having stdin/out closed
-    # that's why we use /dev/pty/m0 and m1 (or equivalent) as replacement
-    # for /dev/console if there's no serial console available
-
-    if grep -q devfs /proc/filesystems; then
-       M0=/dev/pty/m0
-       M1=/dev/pty/m1
-       M2=/dev/pty/m1
-    elif [ -x /sbin/hotplug2 ]; then
-       M0=/dev/ptmx
-       M1=/dev/ptmx
-       M2=/dev/ptmx
-    elif [ -x /sbin/udevd ]; then
-       M0=/dev/pty/ptmx
-       M1=/dev/pty/ptmx
-       M2=/dev/pty/ptmx
-    fi
-    dd if=/dev/console of=/dev/null bs=1 count=0 >/dev/null 2>/dev/null && {
-       M0=/dev/console
-       M1=/dev/console
-       M2=/dev/console    
-    }
-}
-
-boot_hook_add preinit_essential choose_console
-
index 9cc01f2..c200dad 100644 (file)
@@ -3,7 +3,6 @@
 # Copyright (C) 2010 Vertical Communications
 
 indicate_regular_preinit() {
-    echo "- regular preinit -"
     preinit_net_echo "Continuing with Regular Preinit\n"
     pi_indicate_led
 }
diff --git a/package/base-files/files/lib/preinit/60_init_hotplug b/package/base-files/files/lib/preinit/60_init_hotplug
deleted file mode 100644 (file)
index dc05e0e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-# Copyright (C) 2010 Vertical Communications
-
-init_hotplug() {
-   echo "$HOTPLUG" > /proc/sys/kernel/hotplug
-}
-
-boot_hook_add preinit_main init_hotplug
-
index ad24fb8..9a99ee9 100644 (file)
@@ -6,5 +6,4 @@ do_mount_root() {
     boot_run_hook preinit_mount_root
 }
 
-boot_hook_add preinit_main do_mount_root
-
+[ "$INITRAMFS" = "1" ] || boot_hook_add preinit_main do_mount_root
diff --git a/package/base-files/files/lib/preinit/90_init_console b/package/base-files/files/lib/preinit/90_init_console
deleted file mode 100644 (file)
index ca05755..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006-2010 OpenWrt.org
-# Copyright (C) 2010 Vertical Communications
-
-init_console() {
-    if [ "$pi_suppress_stderr" = "y" ]; then
-       exec <$M0 >$M1 2>&0
-    else 
-       exec <$M0 >$M1 2>$M2
-    fi
-}
-
-boot_hook_add preinit_essential init_console
-
index fef3a50..a8f330f 100644 (file)
@@ -3,13 +3,7 @@
 # Copyright (C) 2010 Vertical Communications
 
 run_init() {
-    preinit_echo "- init -"
     preinit_ip_deconfig
-    if [ "$pi_init_suppress_stderr" = "y" ]; then
-       exec env - PATH=$pi_init_path $pi_init_env $pi_init_cmd 2>&0
-    else
-       exec env - PATH=$pi_init_path $pi_init_env $pi_init_cmd
-    fi
 }
 
 boot_hook_add preinit_main run_init
index 2e123ab..969aecb 100644 (file)
@@ -38,7 +38,7 @@ supivot() { # <new_root> <old_root>
        mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
        mount -o noatime,move /proc $1/proc && \
        pivot_root $1 $1$2 || {
-        umount $1 $1
+        umount -l $1 $1
                return 1
        }