Fix the way squashfs mountpoints are handled
This is a hacky way to mount squashfs images at directories other than the root. We mount the image to a loop device and then bind it to another directory. This technically supersedes the 'bind' image type, so that should be removed... Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
parent
67f44f000f
commit
571aa15309
@ -13,6 +13,7 @@ _mnt_squashfs()
|
||||
|
||||
img="${1}"
|
||||
base_img="${img##*/}";
|
||||
mnt="${2}"
|
||||
|
||||
if [ "${copytoram}" = "y" ]; then
|
||||
msg ":: Copying squashfs image to RAM"
|
||||
@ -31,7 +32,11 @@ _mnt_squashfs()
|
||||
break
|
||||
fi
|
||||
/bin/mount -r -t squashfs "/dev/loop${LOOP_NUM}" "/tmpfs/mnt/loop${LOOP_NUM}"
|
||||
if [ "${mnt}" = "/" ]; then
|
||||
/bin/mount -t unionfs -o remount,add=:/tmpfs/mnt/loop${LOOP_NUM}=ro none "/real_root"
|
||||
else
|
||||
_mnt_bind "/tmpfs/mnt/loop${LOOP_NUM}" "${mnt}"
|
||||
fi
|
||||
export LOOP_NUM=$(( $LOOP_NUM + 1 ))
|
||||
}
|
||||
|
||||
@ -118,7 +123,7 @@ run_hook ()
|
||||
if [ "${type}" = "bind" ]; then
|
||||
_mnt_bind "/bootmnt/${img}" ${mountpoint}
|
||||
elif [ "${type}" = "squashfs" ]; then
|
||||
_mnt_squashfs "/bootmnt/${img}"
|
||||
_mnt_squashfs "/bootmnt/${img}" "${mountpoint}"
|
||||
fi
|
||||
done < "/bootmnt/isomounts"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user