Skip to content

Commit defd0d4

Browse files
committed
[fix] : Use share_dir to load config
1 parent c81b3a1 commit defd0d4

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

build.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -508,11 +508,16 @@ prepare_build() {
508508
build_pacman_conf="${script_path}/system/pacman-${arch}.conf"
509509
fi
510510

511+
# Set dirs
512+
airootfs_dir="${work_dir}/${arch}/airootfs"
513+
share_dir="${script_path}/channels/share"
514+
isofs_dir="${work_dir}/iso"
515+
511516
# If there is config for channel. load that.
512-
load_config "${script_path}/channels/share/config.any" "${script_path}/channels/share/config.${arch}"
517+
load_config "${share_dir}/config.any" "${script_path}/channels/share/config.${arch}"
513518
load_config "${channel_dir}/config.any" "${channel_dir}/config.${arch}"
514519

515-
# Set kernel
520+
# Set kernel
516521
if [[ "${customized_kernel}" = false ]]; then
517522
kernel="${defaultkernel}"
518523
fi
@@ -538,11 +543,6 @@ prepare_build() {
538543
cd - > /dev/null 2>&1
539544
fi
540545

541-
# Set dirs
542-
airootfs_dir="${work_dir}/${arch}/airootfs"
543-
share_dir="${script_path}/channels/share"
544-
isofs_dir="${work_dir}/iso"
545-
546546
# Generate iso file name.
547547
local _channel_name
548548
if [[ $(echo "${channel_name}" | sed 's/^.*\.\([^\.]*\)$/\1/') = "add" ]]; then

0 commit comments

Comments
 (0)