mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-28 04:16:13 +02:00
848953efdf
block-mount so that use of block-mount and block-extroot do not require that block-extroot, block-mount, nor the kernel modules they depend, on are required to included in the image. That is block-extroot and dependencies may now be installed as modules onto the jffs2 part of a squashfs system and it will work. In addition packages which are installed into the jffs2 of a squashfs system may now affect preinit, so long as they do not require execution of commands that occur before the merging of the jffs2 and built-in (squashfs) preinit scripts is done. Thanks jow for the preinit merge stuff! git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23110 3c298f89-4303-0410-b956-a3cf2f4a3e73
50 lines
1.7 KiB
Bash
50 lines
1.7 KiB
Bash
#!/bin/sh
|
|
# Copyright (C) 2010 Vertical Communications
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
|
|
|
|
determine_external_root() {
|
|
pi_include /lib/functions/extmount.sh
|
|
pi_include /lib/functions/mount.sh
|
|
|
|
local OLD_UCI_CONFIG_DIR="$UCI_CONFIG_DIR"
|
|
set_jffs_mp
|
|
determine_root_device
|
|
|
|
# extroot requires extroot and fstab config files, therefore
|
|
# we assume configuration is incomplete and not to be used if either of them
|
|
# is missing (for jffs versions of these files on squashfs image)
|
|
if [ "$jffs" = "/tmp/overlay" ] && [ -r "/tmp/overlay/etc/config/fstab" ]; then
|
|
UCI_CONFIG_DIR="/tmp/overlay/etc/config"
|
|
ER_IS_SQUASHFS=true
|
|
fi
|
|
|
|
# For squashfs on firstboot root_device will be tmpfs for the ramoverlay,
|
|
# unless there is a saved config, in which case it will be /dev/root,
|
|
# however in the case of a saved config, it won't be restored until after
|
|
# this script, so there won't be a config on the first boot after
|
|
# flashing a squashfs-based filesystem
|
|
# For ext2, ramdisk, or jffs2 root filesystems root_device is /dev/root
|
|
# For squashfs after firstboot, root filesystem is /dev/root
|
|
# We only use the config from the root or jffs if the root_device is
|
|
# /dev/root
|
|
[ "$root_device" = "/dev/root" ] && {
|
|
er_load_modules
|
|
[ -n "$extroot_settle_time" ] && [ "$extroot_settle_time" -gt 0 ] && {
|
|
sleep $extroot_settle_time
|
|
}
|
|
config_load fstab
|
|
config_foreach config_mount_by_section mount 1
|
|
|
|
[ "$rootfs_found" = "1" ] && grep -q ' /overlay ' /proc/mounts && {
|
|
pi_extroot_mount_success=true
|
|
pi_mount_skip_next=false
|
|
}
|
|
}
|
|
UCI_CONFIG_DIR="$OLD_UCI_CONFIG_DIR"
|
|
}
|
|
|
|
boot_hook_add preinit_mount_root determine_external_root
|
|
|