X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/de0bb1d6c480b2945cf25f80116d963b22dd3c7a..271da7f4e93492f377c0fcf25def4591d60b9fbc:/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 a783f3d8f..2d73dac53 100755 --- a/package/base-files/files/sbin/mount_root +++ b/package/base-files/files/sbin/mount_root @@ -1,54 +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 +# Initialize hook variables et by pulling in from preinit -size=$(awk '/MemTotal:/ {l=5242880;mt=($2*1024);print((s=mt/2)/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 &1 -fi +. /lib/functions/boot.sh -mkdir /dev/shm +for pi_source_file in /lib/preinit/*; do + . $pi_source_file +done -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 +# Override function that doesn't apply to use of mount_root as a command rather +# than as part of preinit -mkdir -p /dev/pts -mount none /dev/pts -t devpts - -jffs2_ready () { - mtdpart="$(find_mtd_part rootfs_data)" - magic=$(hexdump $mtdpart -n 4 -e '4/1 "%02x"') - [ "$magic" != "deadc0de" ] +preinit_echo() { + echo "$@" } -[ 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 - jffs2_ready && { - echo "switching to jffs2" - mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 - fopivot /jffs /rom - } || { - echo "jffs2 not ready yet; using ramdisk" - ramoverlay - } - } - } || mount -o remount,rw /dev/root / -} +boot_run_hook preinit_mount_root