diff options
author | Daniel Dickinson <crazycshore@gmail.com> | 2011-03-13 09:24:24 +0000 |
---|---|---|
committer | Daniel Dickinson <crazycshore@gmail.com> | 2011-03-13 09:24:24 +0000 |
commit | 183b4d1a28eb811e51886f251a1b7f0d749aac41 (patch) | |
tree | 13f4a5768729da111106ca7371e80c021ac51c78 /package/block-extroot/files/60_pivot_usb_root | |
parent | 63c68ca40e83969aeefac18173a92aad6d3827ec (diff) | |
download | upstream-183b4d1a28eb811e51886f251a1b7f0d749aac41.tar.gz upstream-183b4d1a28eb811e51886f251a1b7f0d749aac41.tar.bz2 upstream-183b4d1a28eb811e51886f251a1b7f0d749aac41.zip |
extroot: block-mount block-extroot: Added ability to do a whole disk extroot instead of only an overlay-based extroot.
SVN-Revision: 26109
Diffstat (limited to 'package/block-extroot/files/60_pivot_usb_root')
-rw-r--r-- | package/block-extroot/files/60_pivot_usb_root | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/package/block-extroot/files/60_pivot_usb_root b/package/block-extroot/files/60_pivot_usb_root index 1c9be97cae..b610a4ade1 100644 --- a/package/block-extroot/files/60_pivot_usb_root +++ b/package/block-extroot/files/60_pivot_usb_root @@ -9,10 +9,17 @@ external_root_pivot() { check_skip || [ "$pi_extroot_mount_success" != "true" ] || { echo "switching to external rootfs" - if [ "$ER_IS_SQUASHFS" = "true" ]; then - umount /tmp/overlay + if [ "$ER_OVERLAY_ROM" = "/overlay" ]; then + if [ "$ER_IS_SQUASHFS" = "true" ]; then + umount /tmp/overlay + fi + mount -o remount,ro / && fopivot /overlay /rom && pi_mount_skip_next=true + elif [ "$ER_OVERLAY_ROM" = "/rom" ]; then + if [ "$ER_IS_SQUASHFS" = "true" ]; then + umount /tmp/overlay + fi + mount -o remount,ro / && pivot_rom /rom /rom && pi_mount_skip_next=true fi - mount -o remount,ro / && fopivot /overlay /rom && pi_mount_skip_next=true } } |