Skip to content

Commit 3db03be

Browse files
committed
[update] : No architecture pacman.conf
1 parent e25f6a8 commit 3db03be

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,14 +267,14 @@ for_module(){
267267
# pacstrapを実行
268268
_pacstrap(){
269269
msg_info "Installing packages to ${airootfs_dir}/'..."
270-
pacstrap -C "${build_dir}/pacman-${arch}.conf" -c -G -M -- "${airootfs_dir}" "${@}"
270+
pacstrap -C "${build_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${@}"
271271
msg_info "Packages installed successfully!"
272272
}
273273

274274
# chroot環境でpacmanコマンドを実行
275275
# /etc/alteriso-pacman.confを準備してコマンドを実行します
276276
_run_with_pacmanconf(){
277-
sed "s|^CacheDir =|#CacheDir =|g" "${build_dir}/pacman-${arch}.conf" > "${airootfs_dir}/etc/alteriso-pacman.conf"
277+
sed "s|^CacheDir =|#CacheDir =|g" "${build_dir}/pacman.conf" > "${airootfs_dir}/etc/alteriso-pacman.conf"
278278
"${@}"
279279
remove "${airootfs_dir}/etc/alteriso-pacman.conf"
280280
}
@@ -551,7 +551,7 @@ make_pacman_conf() {
551551
done
552552

553553
msg_debug "Use ${build_pacman_conf}"
554-
sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dir}|g" "${build_pacman_conf}" > "${build_dir}/pacman-${arch}.conf"
554+
sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dir}|g" "${build_pacman_conf}" > "${build_dir}/pacman.conf"
555555

556556
if [[ "${nosigcheck}" = true ]]; then
557557
sed -ir "s|^s*SigLevel.+|SigLevel = Never|g" "${build_pacman_conf}"

0 commit comments

Comments
 (0)