mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fix aarch64 container creation
This commit is contained in:
parent
25c209892a
commit
846311546a
2 changed files with 15 additions and 6 deletions
|
@ -2,8 +2,8 @@
|
||||||
# created by Tobias Powalowski <tpowa@archlinux.org>
|
# created by Tobias Powalowski <tpowa@archlinux.org>
|
||||||
source /usr/lib/archboot/functions
|
source /usr/lib/archboot/functions
|
||||||
source /usr/lib/archboot/container_functions
|
source /usr/lib/archboot/container_functions
|
||||||
export _ARCHBOOT="archboot-arm"
|
_ARCHBOOT="archboot-arm"
|
||||||
export _KEYRING=" archlinuxarm"
|
_KEYRING=" archlinuxarm"
|
||||||
[[ -z "${1}" ]] && _usage
|
[[ -z "${1}" ]] && _usage
|
||||||
_DIR="$1"
|
_DIR="$1"
|
||||||
#shellcheck disable=SC2120
|
#shellcheck disable=SC2120
|
||||||
|
@ -29,10 +29,10 @@ if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
|
||||||
fi
|
fi
|
||||||
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
|
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
|
||||||
_aarch64_pacman_chroot
|
_aarch64_pacman_chroot
|
||||||
_install_base_packages
|
_aarch64_install_base_packages
|
||||||
_cleanmkinitcpio
|
_cleanmkinitcpio
|
||||||
_cleancache
|
_cleancache
|
||||||
_install_archboot
|
_aarch64_install_archboot
|
||||||
_cleanmkinitcpio
|
_cleanmkinitcpio
|
||||||
_cleancache
|
_cleancache
|
||||||
_cleancontainer
|
_cleancontainer
|
||||||
|
@ -40,5 +40,3 @@ if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
|
||||||
fi
|
fi
|
||||||
_set_hostname
|
_set_hostname
|
||||||
echo "Finished container setup in ${_DIR} ."
|
echo "Finished container setup in ${_DIR} ."
|
||||||
unset _ARCHBOOT
|
|
||||||
unset _KEYRING
|
|
||||||
|
|
|
@ -119,6 +119,17 @@ _install_archboot() {
|
||||||
pacman --root "${_DIR}" -Sy "${_ARCHBOOT}" --ignore systemd-resolvconf --noconfirm >/dev/null 2>&1
|
pacman --root "${_DIR}" -Sy "${_ARCHBOOT}" --ignore systemd-resolvconf --noconfirm >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_aarch64_install_base_packages() {
|
||||||
|
echo "Installing packages base linux and ${_LINUX_FIRMWARE} to ${_DIR} ..."
|
||||||
|
systemd-nspawn -q -D "${_DIR}" /bin/bash -c "pacman -Sy base linux ${_LINUX_FIRMWARE} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
|
||||||
|
}
|
||||||
|
|
||||||
|
_aarch64_install_archboot() {
|
||||||
|
echo "Installing ${_ARCHBOOT} to ${_DIR} ..."
|
||||||
|
systemd-nspawn -q -D "${_DIR}" /bin/bash -c "pacman -Sy ${_ARCHBOOT} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
_copy_mirrorlist_and_pacman_conf() {
|
_copy_mirrorlist_and_pacman_conf() {
|
||||||
# copy local mirrorlist to container
|
# copy local mirrorlist to container
|
||||||
echo "Create pacman config and mirrorlist in container..."
|
echo "Create pacman config and mirrorlist in container..."
|
||||||
|
|
Loading…
Reference in a new issue