[update] : Supported default kernel

Author: Hayao0819

allarch.sh

@@ -20,6 +20,7 @@ defaultconfig="${script_path}/default.conf"
 all_arch=("x86_64" "i686")
 customized_username=false
 customized_password=false
+customized_kernel=false
 DEFAULT_ARGUMENT=""
 alteriso_version="3.0"
 
@@ -480,6 +481,14 @@ prepare_build() {
     load_config "${script_path}/channels/share/config.any" "${script_path}/channels/share/config.${arch}"
     load_config "${channel_dir}/config.any" "${channel_dir}/config.${arch}"
 
+    # Set kernel
+    if [[ "${customized_kernel}" = false ]]; then
+        kernel="${defaultkernel}"
+    fi
+
+    eval $(bash "${script_path}/tools/locale.sh" -s -a "${arch}" get "${locale_name}")
+    eval $(bash "${script_path}/tools/kernel.sh" -s -a "${arch}" get "${kernel}")
+
     # Set dirs
     airootfs_dir="${work_dir}/${arch}/airootfs"
     isofs_dir="${work_dir}/iso"
@@ -1182,12 +1191,6 @@ make_iso() {
     msg_info "The password for the live user and root is ${password}."
 }
 
-# Parse files
-parse_files() {
-    eval $(bash "${script_path}/tools/locale.sh" -s -a "${arch}" get "${locale_name}")
-    eval $(bash "${script_path}/tools/kernel.sh" -s -a "${arch}" get "${kernel}")
-}
-
 # Parse options
 ARGUMENT="${@}"
 _opt_short="bc:deg:hjk:l:o:p:rt:u:w:x"
@@ -1232,6 +1235,7 @@ while :; do
             msg_error "This option is obsolete in AlterISO 3. To use Japanese, use \"-l ja\"." "1"
             ;;
         -k | --kernel)
+            customized_kernel=true
             kernel="${2}"
             shift 2
             ;;
@@ -1400,10 +1404,6 @@ if [[ ! "$(cat "${channel_dir}/alteriso" 2> /dev/null)" = "alteriso=${alteriso_v
     fi
 fi
 
-for arch in ${all_arch[@]}; do
-    parse_files
-done
-
 set -eu
 
 prepare_env