From 8ccec185bebe32cf225689487fe2515b12d16ee1 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 22 Jun 2024 12:34:28 +0200 Subject: [PATCH] Replace add_packages_to_rootfs with add_packages_to_image as we don't want to make caches for each variant - also fixes a problem of generating caches all over again - change cache date scheme name to force rebuild them all --- extensions/network/net-chrony.sh | 4 ++-- extensions/network/net-network-manager.sh | 6 +++--- extensions/network/net-systemd-neworkd.sh | 4 ++-- extensions/network/net-systemd-timesyncd.sh | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/extensions/network/net-chrony.sh b/extensions/network/net-chrony.sh index 30da20493b..585ef48942 100644 --- a/extensions/network/net-chrony.sh +++ b/extensions/network/net-chrony.sh @@ -2,6 +2,6 @@ # Extension to manage network time synchronization with Chrony # function add_host_dependencies__install_chrony() { - display_alert "Extension: ${EXTENSION}: Installing additional packages" "chrony" "info" - add_packages_to_rootfs chrony + display_alert "Extension: ${EXTENSION}: Installing additional packages" "chrony" "info" + add_packages_to_image chrony } diff --git a/extensions/network/net-network-manager.sh b/extensions/network/net-network-manager.sh index a6b4d42a80..6fa20950e1 100644 --- a/extensions/network/net-network-manager.sh +++ b/extensions/network/net-network-manager.sh @@ -3,16 +3,16 @@ # function add_host_dependencies__install_network_manager() { display_alert "Extension: ${EXTENSION}: Installing additional packages" "network-manager network-manager-openvpn netplan.io" "info" - add_packages_to_rootfs network-manager network-manager-openvpn netplan.io + add_packages_to_image network-manager network-manager-openvpn netplan.io if [[ "${BUILD_DESKTOP}" == "yes" ]]; then display_alert "Extension: ${EXTENSION}: Installing additional packages for desktop" "network-manager-gnome network-manager-ssh network-manager-vpnc" "info" - add_packages_to_rootfs network-manager-gnome network-manager-ssh network-manager-vpnc + add_packages_to_image network-manager-gnome network-manager-ssh network-manager-vpnc fi if [[ "${DISTRIBUTION}" == "Ubuntu" ]]; then display_alert "Extension: ${EXTENSION}: Installing additional packages for Ubuntu" "network-manager-config-connectivity-ubuntu" "info" - add_packages_to_rootfs network-manager-config-connectivity-ubuntu + add_packages_to_image network-manager-config-connectivity-ubuntu fi } diff --git a/extensions/network/net-systemd-neworkd.sh b/extensions/network/net-systemd-neworkd.sh index 779f2baa65..78211a0c82 100644 --- a/extensions/network/net-systemd-neworkd.sh +++ b/extensions/network/net-systemd-neworkd.sh @@ -2,8 +2,8 @@ # Extension to manage network interfaces with systemd-networkd + Netplan # function add_host_dependencies__install_systemd_networkd() { - display_alert "Extension: ${EXTENSION}: Installing additional packages" "netplan.io" "info" - add_packages_to_rootfs netplan.io + display_alert "Extension: ${EXTENSION}: Installing additional packages" "netplan.io" "info" + add_packages_to_image netplan.io } function pre_install_kernel_debs__configure_systemd_networkd() diff --git a/extensions/network/net-systemd-timesyncd.sh b/extensions/network/net-systemd-timesyncd.sh index c4adaf42cc..af19c7db09 100644 --- a/extensions/network/net-systemd-timesyncd.sh +++ b/extensions/network/net-systemd-timesyncd.sh @@ -2,8 +2,8 @@ # Extension to manage network time synchronization with systemd-timesyncd # function add_host_dependencies__install_systemd-timesyncd() { - display_alert "Extension: ${EXTENSION}: Installing additional packages" "systemd-timesyncd" "info" - add_packages_to_rootfs systemd-timesyncd + display_alert "Extension: ${EXTENSION}: Installing additional packages" "systemd-timesyncd" "info" + add_packages_to_image systemd-timesyncd } function pre_install_kernel_debs__configure_systemd-timesyncd()