diff options
| author | nl6720 <nl6720@gmail.com> | 2021-03-21 14:44:50 +0200 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2021-03-26 10:30:36 -0300 |
| commit | 1ecf7e2ccdc3d45527385dd6cd19130330b6971d (patch) | |
| tree | bf5fdb45a50abd1a640acaa453e533149aa0b186 | |
| parent | 5de12e95b7bfb9a56f68436e0ecc3298ee09591d (diff) | |
mkparabolaiso: do not set default mksquashfs options
Remove hardcoded '-comp xz', it prevents using mksquashfs defaults.
Fixes #112.
| -rw-r--r-- | README.profile.rst | 3 | ||||
| -rwxr-xr-x | parabolaiso/mkparabolaiso | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/README.profile.rst b/README.profile.rst index bac69b5..f6cce5d 100644 --- a/README.profile.rst +++ b/README.profile.rst @@ -53,8 +53,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/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index 23df067..de48fae 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -160,11 +160,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 |