KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix extroot by UUID

Browse source 
Extroot works fine when the target device is specified by a path. It fails
however if the device is specified by UUID (the target partition gets mounted
much later by hotplug hooks). This is because the blkid command is no longer
compiled into BusyBox (since changeset [1]) so it's unavailable for the
preinit phase.

The closest bug report I was able to find is [2], although the reporting person
mentions that /tmp/overlay-disabled showed up which wasn't there in my case.

This patch sets PATH and LD_LIBRARY_PATH environment variables so that the
blkid command installed on the target device can be used by that particular
preinit script.

[1] https://dev.openwrt.org/changeset/26245
[2] https://dev.openwrt.org/ticket/10653

Signed-off-by: Jaroslaw Swierczynski <jarek1701@gmail.com>

SVN-Revision: 32567
This commit is contained in:
Jo-Philipp Wich 2012-07-01 11:06:32 +00:00
parent 5d3f21904f
commit 6e419fbdeb
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package/block-mount/files/50_determine_usb_root
View file

@ -9,6 +9,8 @@ determine_external_root() {
pi_include /lib/functions/mount.sh pi_include /lib/functions/mount.sh
local OLD_UCI_CONFIG_DIR="$UCI_CONFIG_DIR" local OLD_UCI_CONFIG_DIR="$UCI_CONFIG_DIR"
local OLD_PATH="$PATH"
local OLD_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
set_jffs_mp set_jffs_mp
determine_root_device determine_root_device
@ -19,6 +21,9 @@ determine_external_root() {
UCI_CONFIG_DIR="/tmp/overlay/etc/config" UCI_CONFIG_DIR="/tmp/overlay/etc/config"
ER_IS_SQUASHFS=true ER_IS_SQUASHFS=true
ER_OVERLAY_PREFIX="/tmp/overlay" ER_OVERLAY_PREFIX="/tmp/overlay"
PATH=$ER_OVERLAY_PREFIX/sbin:$PATH
LD_LIBRARY_PATH=$ER_OVERLAY_PREFIX/usr/lib:$LD_LIBRARY_PATH
export PATH LD_LIBRARY_PATH
fi fi
# For squashfs on firstboot root_device will be tmpfs for the ramoverlay, # For squashfs on firstboot root_device will be tmpfs for the ramoverlay,
@ -51,6 +56,9 @@ determine_external_root() {
} }
} }
UCI_CONFIG_DIR="$OLD_UCI_CONFIG_DIR" UCI_CONFIG_DIR="$OLD_UCI_CONFIG_DIR"
PATH="$OLD_PATH"
LD_LIBRARY_PATH="$OLD_LD_LIBRARY_PATH"
export PATH LD_LIBRARY_PATH
} }
boot_hook_add preinit_mount_root determine_external_root boot_hook_add preinit_mount_root determine_external_root