[ar7] let 802.1q tagged frames go in and out from cpmac (#6730)

[openwrt.git] / package / base-files / files / sbin / mount_root

diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root
index 607c799..033dfda 100755 (executable)
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -1,40 +1,26 @@
 #!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-. /etc/functions.sh
+# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
 
-mount none /proc -t proc
-size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)<l)?$2-l:s}' /proc/meminfo)
+# Initialize hook variables et by pulling in from preinit
 
-mount none /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
-if grep devfs /proc/filesystems >/dev/null; then
-       mount none /dev -t devfs
-else
-       mount -t tmpfs tmpfs /dev -o size=512K
-       mknod /dev/console c 5 1
-       exec >/dev/console </dev/console 2>&1
-fi
-mkdir /dev/shm
-if grep sysfs /proc/filesystems >/dev/null; then
-       mount -t sysfs none /sys
-       HOTPLUG=""
-       # use a minimal ruleset only for creating device nodes
-       /sbin/hotplug2 --no-persistent --coldplug --set-rules-file /etc/hotplug2-init.rules
-else
-       HOTPLUG="/sbin/hotplug2-dnode"
-fi
-echo "$HOTPLUG" > /proc/sys/kernel/hotplug
+preinit_essential_hook=
+preinit_main_hook=
+failsafe_hook=
+initramfs_hook=
+preinit_mount_root=
 
-mkdir -p /dev/pts
-mount none /dev/pts -t devpts
+. /lib/functions/boot.sh
 
-[ failsafe != "$1" ] && {
-       grep rootfs /proc/mtd >/dev/null 2>/dev/null && {
-               mtd unlock rootfs
-               grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
-                       . /bin/firstboot
-                       echo "switching to jffs2"
-                       mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2
-                       fopivot /jffs /rom
-               }
-       } || mount -o remount,rw /dev/root /
+for pi_source_file in /lib/preinit/*; do
+    . $pi_source_file
+done
+
+# Override function that doesn't apply to use of mount_root as a command rather
+# than as part of preinit
+
+preinit_echo() {
+    echo "$@"
 }
+
+boot_run_hook mount_root