|
|
|
@ -43,7 +43,7 @@ getarg ro && liverw=ro
@@ -43,7 +43,7 @@ getarg ro && liverw=ro
|
|
|
|
|
getarg rw && liverw=rw |
|
|
|
|
[ -z "$liverw" ] && liverw=ro |
|
|
|
|
# mount the backing of the live image first |
|
|
|
|
mkdir -p /run/initramfs/live |
|
|
|
|
mkdir -m 0755 -p /run/initramfs/live |
|
|
|
|
if [ -f $livedev ]; then |
|
|
|
|
# no mount needed - we've already got the LiveOS image in initramfs |
|
|
|
|
case $livedev in |
|
|
|
@ -84,7 +84,7 @@ do_live_overlay() {
@@ -84,7 +84,7 @@ do_live_overlay() {
|
|
|
|
|
# need to know where to look for the overlay |
|
|
|
|
setup="" |
|
|
|
|
if [ -n "$devspec" -a -n "$pathspec" -a -n "$overlay" ]; then |
|
|
|
|
mkdir /overlayfs |
|
|
|
|
mkdir -m 0755 /run/initramfs/overlayfs |
|
|
|
|
mount -n -t auto $devspec /overlayfs || : |
|
|
|
|
if [ -f /overlayfs$pathspec -a -w /overlayfs$pathspec ]; then |
|
|
|
|
losetup $OVERLAY_LOOPDEV /overlayfs$pathspec |
|
|
|
@ -93,7 +93,7 @@ do_live_overlay() {
@@ -93,7 +93,7 @@ do_live_overlay() {
|
|
|
|
|
fi |
|
|
|
|
setup="yes" |
|
|
|
|
fi |
|
|
|
|
umount -l /overlayfs || : |
|
|
|
|
umount -l /run/initramfs/overlayfs || : |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
if [ -z "$setup" ]; then |
|
|
|
@ -125,11 +125,11 @@ if [ -n "$OSMINSQFS" ]; then
@@ -125,11 +125,11 @@ if [ -n "$OSMINSQFS" ]; then
|
|
|
|
|
dd if=$OSMINSQFS of=/osmin.img 2> /dev/null |
|
|
|
|
OSMIN_SQUASHED_LOOPDEV=$( losetup -f ) |
|
|
|
|
losetup -r $OSMIN_SQUASHED_LOOPDEV /osmin.img |
|
|
|
|
mkdir -p /squashfs.osmin |
|
|
|
|
mount -n -t squashfs -o ro $OSMIN_SQUASHED_LOOPDEV /squashfs.osmin |
|
|
|
|
mkdir -m 0755 -p /run/initramfs/squashfs.osmin |
|
|
|
|
mount -n -t squashfs -o ro $OSMIN_SQUASHED_LOOPDEV /run/initramfs/squashfs.osmin |
|
|
|
|
OSMIN_LOOPDEV=$( losetup -f ) |
|
|
|
|
losetup -r $OSMIN_LOOPDEV /squashfs.osmin/osmin |
|
|
|
|
umount -l /squashfs.osmin |
|
|
|
|
losetup -r $OSMIN_LOOPDEV /run/initramfs/squashfs.osmin/osmin |
|
|
|
|
umount -l /run/initramfs/squashfs.osmin |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
# we might have an embedded fs image to use as rootfs (uncompressed live) |
|
|
|
@ -164,8 +164,8 @@ if [ -e "$SQUASHED" ] ; then
@@ -164,8 +164,8 @@ if [ -e "$SQUASHED" ] ; then
|
|
|
|
|
|
|
|
|
|
SQUASHED_LOOPDEV=$( losetup -f ) |
|
|
|
|
losetup -r $SQUASHED_LOOPDEV $SQUASHED |
|
|
|
|
mkdir -p /squashfs |
|
|
|
|
mount -n -t squashfs -o ro $SQUASHED_LOOPDEV /squashfs |
|
|
|
|
mkdir -m 0755 -p /run/initramfs/squashfs |
|
|
|
|
mount -n -t squashfs -o ro $SQUASHED_LOOPDEV /run/initramfs/squashfs |
|
|
|
|
|
|
|
|
|
BASE_LOOPDEV=$( losetup -f ) |
|
|
|
|
if [ -f /squashfs/LiveOS/ext3fs.img ]; then |
|
|
|
|