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

fix aarch64 container creation

Browse source
This commit is contained in:
Tobias Powalowski 2022-02-09 08:59:04 +01:00
parent 25c209892a
commit 846311546a
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,8 @@
# created by Tobias Powalowski <tpowa@archlinux.org>
source /usr/lib/archboot/functions
source /usr/lib/archboot/container_functions
export _ARCHBOOT="archboot-arm"
export _KEYRING=" archlinuxarm"
_ARCHBOOT="archboot-arm"
_KEYRING=" archlinuxarm"
[[ -z "${1}" ]] && _usage
_DIR="$1"
#shellcheck disable=SC2120
@ -29,10 +29,10 @@ if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
fi
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
_aarch64_pacman_chroot
_install_base_packages
_aarch64_install_base_packages
_cleanmkinitcpio
_cleancache
_install_archboot
_aarch64_install_archboot
_cleanmkinitcpio
_cleancache
_cleancontainer
@ -40,5 +40,3 @@ if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
fi
_set_hostname
echo "Finished container setup in ${_DIR} ."
unset _ARCHBOOT
unset _KEYRING

11
usr/lib/archboot/container_functions
View file

@ -119,6 +119,17 @@ _install_archboot() {
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 local mirrorlist to container
echo "Create pacman config and mirrorlist in container..."