Update lib/util-iso-boot.sh

enable ParallelDownloads

Makefile

@@ -13,7 +13,8 @@ BIN_BASE = \
 	bin/manjaro-chroot \
 	bin/fstabgen \
 	bin/signfile \
-	bin/chroot-run
+	bin/chroot-run \
+	bin/check-yaml
 
 LIBS_BASE = \
 	lib/util.sh \

bin/buildiso.in

@@ -131,6 +131,7 @@ usage() {
     echo "                       [default: ${kernel}]"
     echo '    -l                 Create permalink'
     echo '    -m                 Set SquashFS image mode to persistence'
+    echo '    -n                 Disable multilib'
     echo "    -p <profile>       Buildset or profile [default: ${build_list_iso}]"
     echo '    -o                 Enable office installer module'    
     echo '    -q                 Query settings and pretend build'
@@ -150,7 +151,7 @@ usage() {
 
 orig_argv=("$@")
 
-opts='p:a:b:r:t:k:g:d:cfzxmvqhilo'
+opts='p:a:b:r:t:k:g:d:cfzxmnvqhilo'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
@@ -163,6 +164,7 @@ while getopts "${opts}" arg; do
         g) gpgkey="$OPTARG" ;;
         k) kernel="$OPTARG" ;;
         m) persist=true ;;
+        n) no_multilib=true ;;          # only exist if set here
         p) build_list_iso="$OPTARG" ;;
         q) pretend=true ;;
         r) chroots_iso="$OPTARG" ;;

data/mkinitcpio.conf

@@ -1,3 +1,3 @@
-MODULES="loop dm-snapshot"
-HOOKS="base udev miso_shutdown miso miso_loop_mnt miso_pxe_common miso_pxe_http miso_pxe_nbd miso_pxe_nfs miso_kms modconf block filesystems keyboard keymap"
+MODULES=(loop dm-snapshot)
+HOOKS=(base udev miso_shutdown miso miso_loop_mnt miso_pxe_common miso_pxe_http miso_pxe_nbd miso_pxe_nfs miso_kms modconf block filesystems keyboard keymap)
 COMPRESSION="xz"

data/pacman-default.conf

@@ -38,7 +38,7 @@ Architecture = auto
 # We cannot check disk space from within a chroot environment
 #CheckSpace
 #VerbosePkgLists
-#ParallelDownloads = 5
+ParallelDownloads = 4
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -86,4 +86,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-

data/pacman-multilib.conf

@@ -38,7 +38,7 @@ Architecture = auto
 # We cannot check disk space from within a chroot environment
 #CheckSpace
 #VerbosePkgLists
-#ParallelDownloads = 5
+ParallelDownloads = 4
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.

lib/util-iso-boot.sh

@@ -18,7 +18,7 @@ prepare_initcpio(){
 
 prepare_initramfs(){
     cp ${DATADIR}/mkinitcpio.conf $1/etc/mkinitcpio-${iso_name}.conf
-    local _kernver=$(cat $1/usr/lib/modules/*/version)
+    local _kernver=$(cat $1/usr/lib/modules/*/kernelbase | awk -F'-' '{print $1}')
     if [[ -n ${gpgkey} ]]; then
         su ${OWNER} -c "gpg --export ${gpgkey} >${USERCONFDIR}/gpgkey"
         exec 17<>${USERCONFDIR}/gpgkey

lib/util.sh

@@ -213,7 +213,7 @@ init_common(){
 
     [[ -z ${log_dir} ]] && log_dir='/var/log/manjaro-tools'
 
-    [[ -z ${build_mirror} ]] && build_mirror='https://mirror.alpix.eu/manjaro'
+    [[ -z ${build_mirror} ]] && build_mirror='https://mirror.easyname.at/manjaro'
 
     [[ -z ${tmp_dir} ]] && tmp_dir='/tmp/manjaro-tools'
 }
@@ -409,6 +409,7 @@ load_profile_config(){
     [[ -z ${snap_channel} ]] && snap_channel="stable"
 
     [[ -z ${multilib} ]] && multilib="true"
+    [[ ${no_multilib} == 'true' ]] && multilib="false"
 
     [[ -z ${nonfree_mhwd} ]] && nonfree_mhwd="true"
 
@@ -516,6 +517,7 @@ reset_profile(){
     unset extra
     unset full_iso
     unset office_installer
+    unset no_multilib
 }
 
 check_profile(){
@@ -834,7 +836,7 @@ create_chksums() {
 init_profiles() {
     _workdir='/usr/share/manjaro-tools'
     if [[ -d ${_workdir}/iso-profiles ]]; then
-        rm -Rf ${_workdir}/iso-profiles ]]
+        rm -Rf ${_workdir}/iso-profiles
     fi
     git clone -q --depth 1 -b ${branch} https://gitlab.manjaro.org/profiles-and-settings/iso-profiles.git ${_workdir}/iso-profiles/