From 9e5c7951bd6a733309e4895b5e8e9adbf08c4552 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sat, 19 Mar 2022 10:07:31 +0100 Subject: [PATCH] copy defaults to container --- usr/bin/archboot-x86_64-create-container.sh | 1 + usr/lib/archboot/container_functions | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/usr/bin/archboot-x86_64-create-container.sh b/usr/bin/archboot-x86_64-create-container.sh index 4c6e0ba90..f7241b886 100755 --- a/usr/bin/archboot-x86_64-create-container.sh +++ b/usr/bin/archboot-x86_64-create-container.sh @@ -23,6 +23,7 @@ _clean_container "${1}" _clean_archboot_cache _generate_keyring "${1}" || exit 1 _copy_mirrorlist_and_pacman_conf "${1}" +_copy_archboot_defaults "${1}" _change_pacman_conf "${1}" || exit 1 # enable [testing] if enabled in host if grep -q "^\[testing" /etc/pacman.conf; then diff --git a/usr/lib/archboot/container_functions b/usr/lib/archboot/container_functions index b5b317f81..688573503 100644 --- a/usr/lib/archboot/container_functions +++ b/usr/lib/archboot/container_functions @@ -158,6 +158,11 @@ _copy_mirrorlist_and_pacman_conf() { grep -qw 'archboot' /etc/hostname && cp /etc/pacman.conf "${1}"/etc/pacman.conf } +_copy_archboot_defaults() { + echo "Copy archboot defaults to container ..." + ! grep -qw 'archboot' /etc/hostname && cp /etc/archboot/defaults "${1}"/etc/archboot/defaults +} + _reproducibility() { echo "Reproducibility changes ..." sed -i -e '/INSTALLDATE/{n;s/.*/0/}' "${1}"/var/lib/pacman/local/*/desc