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

always generate locales after archboot installation

Browse source
This commit is contained in:
Tobias Powalowski 2022-02-10 14:22:59 +01:00
parent 387ba680c8
commit cd9044f2c3
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,8 +9,7 @@ _DIR="$1"
_parameters "$@" _parameters "$@"
_root_check _root_check
echo "Starting container creation ..." echo "Starting container creation ..."
echo "Create directory ${_DIR} ..." [[ -d "${_DIR}" ]] || (echo "Create directory ${_DIR} ..."; mkdir "${_DIR}")
mkdir "${_DIR}"
if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
_prepare_pacman || exit 1 _prepare_pacman || exit 1
_install_base_packages || exit 1 _install_base_packages || exit 1
@ -18,11 +17,11 @@ if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
_clean_cache || exit 1 _clean_cache || exit 1
_install_archboot || exit 1 _install_archboot || exit 1
_umount_special || exit 1 _umount_special || exit 1
_generate_locales || exit 1
_clean_locale
_clean_container || exit 1 _clean_container || exit 1
_clean_archboot_cache _clean_archboot_cache
_generate_keyring || exit 1 _generate_keyring || exit 1
_generate_locales || exit 1
_clean_locale
_copy_mirrorlist_and_pacman_conf _copy_mirrorlist_and_pacman_conf
_change_pacman_conf || exit 1 _change_pacman_conf || exit 1
fi fi
@ -34,9 +33,9 @@ if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
_aarch64_install_archboot || exit 1 _aarch64_install_archboot || exit 1
_clean_mkinitcpio || exit 1 _clean_mkinitcpio || exit 1
_clean_cache || exit 1 _clean_cache || exit 1
_clean_container || exit 1
_generate_locales || exit 1 _generate_locales || exit 1
_clean_locale _clean_locale
_clean_container || exit 1
fi fi
_set_hostname || exit 1 _set_hostname || exit 1
echo "Finished container setup in ${_DIR} ." echo "Finished container setup in ${_DIR} ."

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

@ -10,17 +10,17 @@ _parameters "$@"
_root_check _root_check
_x86_64_check _x86_64_check
echo "Starting container creation ..." echo "Starting container creation ..."
echo "Create directories in ${_DIR} ..." [[ -d "${_DIR}" ]] || (echo "Create directory ${_DIR} ..."; mkdir "${_DIR}")
_prepare_pacman || exit 1 _prepare_pacman || exit 1
_install_base_packages || exit 1 _install_base_packages || exit 1
_clean_mkinitcpio || exit 1 _clean_mkinitcpio || exit 1
_clean_cache || exit 1 _clean_cache || exit 1
_install_archboot || exit 1 _install_archboot || exit 1
_umount_special || exit 1 _umount_special || exit 1
_clean_container || exit 1
_clean_archboot_cache
_generate_locales || exit 1 _generate_locales || exit 1
_clean_locale _clean_locale
_clean_container || exit 1
_clean_archboot_cache
_generate_keyring || exit 1 _generate_keyring || exit 1
_copy_mirrorlist_and_pacman_conf _copy_mirrorlist_and_pacman_conf
_change_pacman_conf || exit 1 _change_pacman_conf || exit 1

2
usr/lib/archboot/container_functions
View file

@ -80,6 +80,7 @@ _clean_archboot_cache() {
_prepare_pacman() { _prepare_pacman() {
# prepare pacman dirs # prepare pacman dirs
echo "Create directories in ${_DIR} ..."
mkdir -p "${_DIR}/var/lib/pacman" mkdir -p "${_DIR}/var/lib/pacman"
mkdir -p "${_CACHEDIR}" mkdir -p "${_CACHEDIR}"
[[ -e "${_DIR}/proc" ]] || mkdir -m 555 "${_DIR}/proc" [[ -e "${_DIR}/proc" ]] || mkdir -m 555 "${_DIR}/proc"
@ -129,7 +130,6 @@ _aarch64_install_archboot() {
systemd-nspawn -q -D "${_DIR}" /bin/bash -c "pacman -Sy ${_ARCHBOOT} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1 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..."