root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

move pacman parameters to main program

Browse source
This commit is contained in:
Tobias Powalowski 2022-10-02 09:32:08 +02:00
parent fcfe2f783b
commit 5f32932653
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
usr/bin/archboot-aarch64-create-container.sh
View file

@ -11,6 +11,7 @@ echo "Starting container creation ..."
if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
_create_pacman_conf "${1}"
_prepare_pacman "${1}" || exit 1
_pacman_parameters "${1}"
_install_base_packages "${1}" || exit 1
_clean_mkinitcpio "${1}"
_clean_cache "${1}"
@ -26,8 +27,9 @@ fi
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
_pacman_chroot "${1}" "${_ARCHBOOT_AARCH64_CHROOT_PUBLIC}" "${_PACMAN_AARCH64_CHROOT}" || exit 1
_create_pacman_conf "${1}" "use_container_config"
_install_base_packages "${1}" "use_binfmt" || exit 1
_install_archboot "${1}" "use_binfmt" || exit 1
_pacman_parameters "${1}" "use_binfmt"
_install_base_packages "${1}" || exit 1
_install_archboot "${1}" || exit 1
_fix_groups "${1}"
_clean_mkinitcpio "${1}"
_clean_cache "${1}"

6
usr/bin/archboot-riscv64-create-container.sh
View file

@ -11,6 +11,7 @@ echo "Starting container creation ..."
if [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then
_create_pacman_conf "${1}"
_prepare_pacman "${1}" || exit 1
_pacman_parameters "${1}"
_install_base_packages "${1}" || exit 1
_clean_mkinitcpio "${1}"
_clean_cache "${1}"
@ -26,8 +27,9 @@ fi
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
_pacman_chroot "${1}" "${_ARCHBOOT_RISCV64_CHROOT_PUBLIC}" "${_PACMAN_RISCV64_CHROOT}" || exit 1
_create_pacman_conf "${1}" "use_container_config"
_install_base_packages "${1}" "use_binfmt" || exit 1
_install_archboot "${1}" "use_binfmt" || exit 1
_pacman_parameters "${1}" "use_binfmt"
_install_base_packages "${1}" || exit 1
_install_archboot "${1}" || exit 1
_fix_groups "${1}"
_clean_mkinitcpio "${1}"
_clean_cache "${1}"

1
usr/bin/archboot-x86_64-create-container.sh
View file

@ -11,6 +11,7 @@ echo "Starting container creation ..."
[[ -d "${1}" ]] || (echo "Create directory ${1} ..."; mkdir "${1}")
_create_pacman_conf "${1}"
_prepare_pacman "${1}" || exit 1
_pacman_parameters "${1}"
_install_base_packages "${1}" || exit 1
_clean_mkinitcpio "${1}"
_clean_cache "${1}"

2
usr/lib/archboot/container.sh
View file

@ -157,7 +157,6 @@ _pacman_parameters() {
}
_install_base_packages() {
_pacman_parameters "${1}" "${2}"
_PACMAN_OPTIONS="${_PACKAGES} ${_PACMAN_DEFAULTS}"
if [[ "${2}" == "use_binfmt" ]]; then
[[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb
@ -169,7 +168,6 @@ _install_base_packages() {
}
_install_archboot() {
_pacman_parameters "${1}" "${2}"
_PACMAN_OPTIONS="${_ARCHBOOT} ${_PACMAN_DEFAULTS}"
if [[ "${2}" == "use_binfmt" ]]; then
_PACMAN_DB=""