root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

resolve conflict

Browse source
This commit is contained in:
Bernhard Landauer 2019-11-17 10:11:23 +01:00
parent c21c9f140d
commit 55db3e7cb3
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/buildiso.in
View file

@ -123,7 +123,7 @@ usage() {
echo ' -m Set SquashFS image mode to persistence' echo ' -m Set SquashFS image mode to persistence'
echo ' -c Disable clean work dir' echo ' -c Disable clean work dir'
echo ' -f Build full ISO (extra=true)' echo ' -f Build full ISO (extra=true)'
echo ' -d <comp> Compression used for build ISO: xz, gzip, lzma, lzo, lz4' echo ' -d <comp> Compression used for build ISO: xz, gzip, lzma, lzo, lz4, zstd'
echo " [default: ${iso_compression}]" echo " [default: ${iso_compression}]"
echo ' -x Build images only' echo ' -x Build images only'
echo ' -z Generate iso only' echo ' -z Generate iso only'

5
data/manjaro-tools.conf
View file

@ -55,9 +55,8 @@
# the branding; default: auto # the branding; default: auto
# dist_branding="MJRO" # dist_branding="MJRO"
# compression used, possible values xz (default, best compression), gzip, lzma, lzo, lz4 # compression used, possible values xz (default, best compression), gzip, lzma, lzo, lz4, zstd
# lz4 is faster but worst compression, may be useful for locally testing isos # iso_compression=zstd
# iso_compression=xz
# unset defaults to given value # unset defaults to given value
# kernel="linux53" # kernel="linux53"

5
lib/util-iso.sh
View file

@ -138,8 +138,13 @@ make_sfs() {
mksfs_args+=(${sfs} -noappend) mksfs_args+=(${sfs} -noappend)
local highcomp="-b 256K -Xbcj x86" local highcomp="-b 256K -Xbcj x86"
<<<<<<< HEAD
[[ "${iso_compression}" != "xz" ]] && highcomp="" [[ "${iso_compression}" != "xz" ]] && highcomp=""
=======
[[ "${iso_compression}" != "zstd" ]] && highcomp=""
>>>>>>> af495a6... iso_compression default to zstd
if [[ "${name}" == "mhwdfs" && ${used_kernel} < "4" ]]; then if [[ "${name}" == "mhwdfs" && ${used_kernel} < "4" ]]; then
mksfs_args+=(-comp lz4) mksfs_args+=(-comp lz4)

2
lib/util.sh
View file

@ -311,7 +311,7 @@ init_buildiso(){
[[ -z ${dist_branding} ]] && dist_branding="MJRO" [[ -z ${dist_branding} ]] && dist_branding="MJRO"
[[ -z ${iso_compression} ]] && iso_compression='xz' [[ -z ${iso_compression} ]] && iso_compression='zstd'
iso_label=$(get_iso_label "${dist_branding}${dist_release//.}") iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")