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>2010-10-17 16:12:37 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-10-20 23:58:30 -0300
commitaf66220c7526a81a4f49f4588764a36c59416114 (patch)
tree38b4c5c2a7b057bc46ac07225c4364de26a04471
parent487436b8ea27d31b751b7a996fd866795a74c8c2 (diff)
[archiso2dual] Add support for squashfs compression types
Add a note about supported status in Linux versions. Needs squashfs-tools-4.1 (now on extra). Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rwxr-xr-xarchiso2dual/archiso2dual15
1 files changed, 12 insertions, 3 deletions
diff --git a/archiso2dual/archiso2dual b/archiso2dual/archiso2dual
index c7dafee..1d78e1a 100755
--- a/archiso2dual/archiso2dual
+++ b/archiso2dual/archiso2dual
@@ -19,6 +19,7 @@ work_dir="/tmp/archiso2dual"
isomounts_file="/usr/share/archiso2dual/isomounts"
syslinuxcfg_file="/usr/share/archiso2dual/syslinux.cfg"
removefiles_file="/usr/share/archiso2dual/removefiles.lst"
+compression="gzip"
appname=${0##*/}
_error="0"
_confirm="n"
@@ -114,9 +115,9 @@ mksquashfs_image() {
arch=${2}
rm -f ${work_dir}/iso/${arch}/${img}.sqfs
if [ "${quiet}" = "y" ]; then
- mksquashfs ${work_dir}/tmp/${arch}/${img} ${work_dir}/iso/${arch}/${img}.sqfs > /dev/null
+ mksquashfs ${work_dir}/tmp/${arch}/${img} ${work_dir}/iso/${arch}/${img}.sqfs -comp ${compression} > /dev/null
else
- mksquashfs ${work_dir}/tmp/${arch}/${img} ${work_dir}/iso/${arch}/${img}.sqfs
+ mksquashfs ${work_dir}/tmp/${arch}/${img} ${work_dir}/iso/${arch}/${img}.sqfs -comp ${compression}
fi
}
@@ -240,6 +241,12 @@ show_help()
(default to '${publisher}')"
echo " -A <application> Set an application name for the disk
(default to '${application}')"
+ echo " -c <compressor> Set SquashFS compression type: gzip, lzma or lzo
+ (default to '${compression}')"
+ echo " NOTES:"
+ echo " lzma: not officially supported yet by Linux (2.6.36)"
+ echo " lzo: needs Linux >= 2.6.36"
+
echo " -y Confirm execution (otherwise only show configuration)"
echo " -v Enable verbose output"
echo " -h This message"
@@ -260,6 +267,7 @@ show_config() {
echo " label: ${label}"
echo " publisher: ${publisher}"
echo " application: ${application}"
+ echo " compression: ${compression}"
echo
if [ "${profile_type}" = "full" ]; then
echo "These files will be deleted (selected via -R option)"
@@ -335,7 +343,7 @@ if [ "$EUID" != "0" ]; then
exit 1
fi
-while getopts '3:6:o:T:M:S:R:L:P:A:yvh' arg; do
+while getopts '3:6:o:T:M:S:R:L:P:A:c:yvh' arg; do
case "${arg}" in
3) isofile_i686="${OPTARG}" ;;
6) isofile_x86_64="${OPTARG}" ;;
@@ -351,6 +359,7 @@ while getopts '3:6:o:T:M:S:R:L:P:A:yvh' arg; do
L) label="${OPTARG}" ;;
P) publisher="${OPTARG}" ;;
A) application="${OPTARG}" ;;
+ c) compression="${OPTARG}" ;;
w) work_dir="${OPTARG}" ;;
y) _confirm="y" ;;
v) quiet="n"; _v="-v" ;;