Skip to content

Commit

Permalink
Replace add_packages_to_rootfs with add_packages_to_image as we don't…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
igorpecovnik committed Jun 22, 2024
1 parent 7f11151 commit 8ccec18
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions extensions/network/net-chrony.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
6 changes: 3 additions & 3 deletions extensions/network/net-network-manager.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions extensions/network/net-systemd-neworkd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions extensions/network/net-systemd-timesyncd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 8ccec18

Please sign in to comment.