mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
fix more buildchain errors
This commit is contained in:
parent
f4ff519105
commit
f8b646392d
3 changed files with 8 additions and 8 deletions
|
@ -19,11 +19,11 @@ if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
|
|||
_install_archboot || exit 1
|
||||
_umount_special || exit 1
|
||||
_clean_container || exit 1
|
||||
_clean_archboot_cache || exit 1
|
||||
_clean_archboot_cache
|
||||
_generate_keyring || exit 1
|
||||
_generate_locales || exit 1
|
||||
_clean_locale || exit 1
|
||||
_copy_mirrorlist_and_pacman_conf || exit 1
|
||||
_clean_locale
|
||||
_copy_mirrorlist_and_pacman_conf
|
||||
_change_pacman_conf || exit 1
|
||||
fi
|
||||
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
|
||||
|
@ -35,7 +35,7 @@ if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
|
|||
_clean_mkinitcpio || exit 1
|
||||
_clean_cache || exit 1
|
||||
_clean_container || exit 1
|
||||
_clean_locale || exit 1
|
||||
_clean_locale
|
||||
fi
|
||||
_set_hostname || exit 1
|
||||
echo "Finished container setup in ${_DIR} ."
|
||||
|
|
|
@ -18,11 +18,11 @@ _clean_cache || exit 1
|
|||
_install_archboot || exit 1
|
||||
_umount_special || exit 1
|
||||
_clean_container || exit 1
|
||||
_clean_archboot_cache || exit 1
|
||||
_clean_archboot_cache
|
||||
_generate_locales || exit 1
|
||||
_clean_locale || exit 1
|
||||
_clean_locale
|
||||
_generate_keyring || exit 1
|
||||
_copy_mirrorlist_and_pacman_conf || exit 1
|
||||
_copy_mirrorlist_and_pacman_conf
|
||||
_change_pacman_conf || exit 1
|
||||
# enable [testing] if enabled in host
|
||||
if grep -q "^\[testing" /etc/pacman.conf; then
|
||||
|
|
|
@ -140,5 +140,5 @@ _copy_mirrorlist_and_pacman_conf() {
|
|||
|
||||
_set_hostname() {
|
||||
echo "Setting hostname to archboot ..."
|
||||
echo 'archboot' > "${_DIR}/etc/hostname" >/dev/null 2>&1
|
||||
echo 'archboot' > "${_DIR}/etc/hostname"
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue