Skip to content

Commit 5e44b3a

Browse files
committed
[update] : Supported pacman debug in pacstrap
1 parent 6acb0d2 commit 5e44b3a

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

build.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,11 @@ for_module(){
260260
# pacstrapを実行
261261
_pacstrap(){
262262
msg_info "Installing packages to ${airootfs_dir}/'..."
263-
pacstrap -C "${build_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${@}"
263+
if [[ "${pacman_debug}" = true ]]; then
264+
pacstrap -C "${build_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" --debug "${@}"
265+
else
266+
pacstrap -C "${build_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${@}"
267+
fi
264268
msg_info "Packages installed successfully!"
265269
}
266270

@@ -1074,7 +1078,7 @@ make_iso() {
10741078
# Parse options
10751079
ARGUMENT=("${@}")
10761080
OPTS="a:bc:deg:hjk:l:o:p:rt:u:w:x"
1077-
OPTL="arch:,boot-splash,comp-type:,debug,cleaning,cleanup,gpgkey:,help,lang:,japanese,kernel:,out:,password:,comp-opts:,user:,work:,bash-debug,nocolor,noconfirm,nodepend,gitversion,msgdebug,noloopmod,tarball,noiso,noaur,nochkver,channellist,config:,noefi,nodebug,nosigcheck,normwork,log,logpath:,nolog,nopkgbuild,pacman_debug"
1081+
OPTL="arch:,boot-splash,comp-type:,debug,cleaning,cleanup,gpgkey:,help,lang:,japanese,kernel:,out:,password:,comp-opts:,user:,work:,bash-debug,nocolor,noconfirm,nodepend,gitversion,msgdebug,noloopmod,tarball,noiso,noaur,nochkver,channellist,config:,noefi,nodebug,nosigcheck,normwork,log,logpath:,nolog,nopkgbuild,pacman-debug"
10781082
if ! OPT=$(getopt -o ${OPTS} -l ${OPTL} -- ${DEFAULT_ARGUMENT} "${ARGUMENT[@]}"); then
10791083
exit 1
10801084
fi

docs/Todo.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,3 @@
6060
- [x] x86_64
6161
- [x] en
6262
- [x] ja
63-
64-
- pacmanのデバッグをmkalteriso上でサポートする
65-
- aur.shを実行する際に`pacman_debug`の値によってaur.shのオプションを変更する

0 commit comments

Comments
 (0)