Commit 3f1ee07d authored by Gerardo Exequiel Pozzi's avatar Gerardo Exequiel Pozzi
Browse files

Support custom isomounts in archiso hook.



Implement this feature request:
FS#16835 - isomounts file whithin archiso hook is inflexible

Add an optional "isomounts" kernel command line parameter.
In this way, can have differents combinations of
kernels/ramdisk/filesystems.sqfs on the same media.

Signed-off-by: default avatarGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
parent 6964b13d
......@@ -49,6 +49,13 @@ run_hook ()
if [ "x${ramdisk_size}" = "x" ]; then
ramdisk_size="75%"
fi
if [ "x${isomounts}" != "x" ]; then
isomounts="/bootmnt/${isomounts}"
else
isomounts="/bootmnt/isomounts"
fi
msg -n ":: Mounting tmpfs, size=${ramdisk_size}..."
mount -t tmpfs -o "size=${ramdisk_size}" tmpfs /tmpfs
msg "done."
......@@ -73,10 +80,10 @@ run_hook ()
_FSTYPE=$FSTYPE
fi
if mount -r -t "${_FSTYPE}" /dev/archiso /bootmnt >/dev/null 2>&1; then
if [ -e "/bootmnt/isomounts" ]; then
if [ -e "${isomounts}" ]; then
echo "SUCCESS: Mounted archiso volume successfully."
else
echo "ERROR: Mounting was successful, but the isomounts file does not exist."
echo "ERROR: Mounting was successful, but the ${isomounts} file does not exist."
exit 1
fi
else
......@@ -112,7 +119,7 @@ run_hook ()
elif [ "${type}" = "squashfs" ]; then
_mnt_squashfs "/bootmnt/${img}" "${mountpoint}"
fi
done < "/bootmnt/isomounts"
done < "${isomounts}"
# Bind our bootmnt dir into the live system
_mnt_bind /bootmnt /bootmnt
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment