commit 95146870fe653c86d8c015bad227a497b25efceb parent c09251517deaef4fad1fd694a50ee3b611073a45 Author: parazyd <parazyd@dyne.org> Date: Sat, 16 Dec 2017 20:35:23 +0100 Fixes regarding live-sdk. Diffstat:
| M | zlibs/iso | | | 14 | ++++++++++++-- |
| M | zlibs/sysconf | | | 2 | +- |
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/zlibs/iso b/zlibs/iso @@ -87,10 +87,20 @@ iso_squash_strap() { notice "creating squashfs out of strapdir" - [[ -n "$mkefi" ]] && _uefi_opt="-Xbcj x86" + case "$arch" in + amd64|i386) + _compfilt="-Xbcj x86" + ;; + arm*) + _compfilt="-Xbcj arm" + ;; + *) + _compfilt="" + ;; + esac pushd $workdir sudo mksquashfs $strapdir binary/live/filesystem.squashfs \ - -comp xz ${=_uefi_opt} -noappend || zerr + -comp xz ${=_compfilt} -noappend || zerr popd } diff --git a/zlibs/sysconf b/zlibs/sysconf @@ -30,7 +30,7 @@ EOF conf_print_fstab() { fn conf_print_fstab - + [[ -n "$livesdk_version" ]] && return cat <<EOF #<file system> <mount point> <type> <options> <dump> <pass> # rootfs