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-03-21 14:44:50 +0200
committernl6720 <nl6720@gmail.com>2021-03-26 08:37:38 +0200
commit8cbc5483591a74fee2b566eff92e1423cbe9c0ad (patch)
tree0671e9230522b3ecb14a693d67efda2fb648172b
parent8050fa4797dc563c0dad482c9849709538bba82a (diff)
mkarchiso: do not set default mksquashfs options
Remove hardcoded '-comp xz', it prevents using mksquashfs defaults. Fixes #112.
-rw-r--r--README.profile.rst3
-rwxr-xr-xarchiso/mkarchiso5
2 files changed, 1 insertions, 7 deletions
diff --git a/README.profile.rst b/README.profile.rst
index c22e7bb..89477d2 100644
--- a/README.profile.rst
+++ b/README.profile.rst
@@ -51,8 +51,7 @@ The image file is constructed from some of the variables in **profiledef.sh**: `
- `ext4+squashfs`: Create an ext4 partition, copy the airootfs work directory to it and create a squashfs image from it
- `erofs`: Create an EROFS image for the airootfs work directory
* `airootfs_image_tool_options`: An array of options to pass to the tool to create the airootfs image. `mksquashfs` and
- `mkfs.erofs` are supported. See `mksquashfs --help` or `mkfs.erofs --help` for all possible options (defaults to
- `('-comp' 'xz')` for squashfs).
+ `mkfs.erofs` are supported. See `mksquashfs --help` or `mkfs.erofs --help` for all possible options.
* `file_permissions`: An associative array that lists files and/or directories who need specific ownership or
permissions. The array's keys contain the path and the value is a colon separated list of owner UID, owner GID and
access mode. E.g. `file_permissions=(["/etc/shadow"]="0:0:400")`. When directories are listed with a trailing backslash ("/") **all** files and directories contained within the listed directory will have the same owner UID, owner GID, and access mode applied recursively.
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index f9c64ac..b6c5822 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -155,11 +155,6 @@ _cleanup_airootfs() {
}
_run_mksquashfs() {
- # Set default mksquashfs options
- if (( ${#airootfs_image_tool_options[@]} < 1 )); then
- airootfs_image_tool_options=('-comp' 'xz')
- fi
-
local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
if [[ "${quiet}" == "y" ]]; then
mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" -no-progress > /dev/null