faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkarchiso: do not set default mksquashfs options

Browse Source 
Remove hardcoded '-comp xz', it prevents using mksquashfs defaults.

Fixes #112.
This commit is contained in:
nl6720 2021-03-21 14:44:50 +02:00
parent 8050fa4797
commit 8cbc548359
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.profile.rst
View File

@ -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 - `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 - `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 * `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 `mkfs.erofs` are supported. See `mksquashfs --help` or `mkfs.erofs --help` for all possible options.
`('-comp' 'xz')` for squashfs).
* `file_permissions`: An associative array that lists files and/or directories who need specific ownership or * `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 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. 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.

5
archiso/mkarchiso
View File

@ -155,11 +155,6 @@ _cleanup_airootfs() {
} }
_run_mksquashfs() { _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" local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
if [[ "${quiet}" == "y" ]]; then if [[ "${quiet}" == "y" ]]; then
mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" -no-progress > /dev/null mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" -no-progress > /dev/null