Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2009-10-26 01:35:05 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2009-10-26 02:02:59 -0300
commit3f1ee07d842c4f88deaebc83386c01b4b86e211e (patch)
tree99e298877a35893b6ceae827106a3cca1a41f5e5
parent6964b13d804ff46bdcd4f713e9bfbd8b11063e28 (diff)
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: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rw-r--r--archiso/hooks/archiso13
1 files changed, 10 insertions, 3 deletions
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso
index 8ff23a3..aeaded2 100644
--- a/archiso/hooks/archiso
+++ b/archiso/hooks/archiso
@@ -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