Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2021-11-05 12:46:54 +0200
committernl6720 <nl6720@gmail.com>2021-11-05 13:01:28 +0200
commit8cfe29043f0626e12e157cd3f2354a6baf3ba076 (patch)
tree82520be623e575b6a4a31ea2a0426103d6905601
parent009140bd8bb497df148c3b468f0e1b217371d62c (diff)
mkarchiso: use mksquashfs -quiet instead of redirecting its stdout to /dev/null
mksquashfs supports a -quiet option since squashfs-tools 4.4. Use this option in non-verbose mode instead of redirecting stdout of the whole command to /dev/null. This allows to have only one instance of mksquashfs in _run_mksquashfs instead of multiple ones in if-then-else. Related to #148.
-rwxr-xr-xarchiso/mkarchiso9
1 files changed, 3 insertions, 6 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index b7fe91c..8332604 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -165,13 +165,10 @@ _cleanup_pacstrap_dir() {
# Create a squashfs image and place it in the ISO 9660 file system.
# $@: options to pass to mksquashfs
_run_mksquashfs() {
- local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
+ local mksquashfs_options=() image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
rm -f -- "${image_path}"
- if [[ "${quiet}" == "y" ]]; then
- mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" -no-progress > /dev/null
- else
- mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}"
- fi
+ [[ ! "${quiet}" == "y" ]] || mksquashfs_options+=('-no-progress' '-quiet')
+ mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" "${mksquashfs_options[@]}"
}
# Create an ext4 image containing the root file system and pack it inside a squashfs image.