Move Network Manager bits into extensions

- use Chrony with Network Manager - use timesync with systemd-networkd - use NetPlan with Network manager only - move command-not-found to CLI image only
armbian · Jun 18, 2024 · 5787057 · 5787057
1 parent c14e166
commit 5787057
Show file tree

Hide file tree

Showing 42 changed files with 117 additions and 207 deletions.
diff --git a/config/cli/bullseye/main/packages b/config/cli/bullseye/main/packages
@@ -1,8 +1,6 @@
 alsa-utils
 bc
 bridge-utils
-chrony
-command-not-found
 console-setup
 cron
 curl
@@ -30,8 +28,6 @@ man-db
 mmc-utils
 ncurses-term
 nano
-netplan.io
-network-manager
 openssh-server
 parted
 psmisc

diff --git a/config/cli/common/main/packages b/config/cli/common/main/packages
@@ -1,24 +1,19 @@
 alsa-utils
 bc
-bridge-utils
-chrony
-command-not-found
 console-setup
 cron
 curl
 dbus-user-session
 dialog
 debconf-utils
 debsums
-device-tree-compiler
 dosfstools
-ethtool
 fake-hwclock
 fdisk
 figlet
 htop
-inetutils-ping
 init
+inetutils-ping
 initramfs-tools
 iw
 jq
@@ -30,22 +25,17 @@ man-db
 mmc-utils
 ncurses-term
 nano
-netplan.io
-network-manager
 openssh-server
 parted
 psmisc
 rsync
 rsyslog
 sudo
 systemd-resolved
-sysfsutils
-sysstat
 toilet
 tzdata
 u-boot-tools
 usbutils
-vlan
 wget
 wireless-tools
 wireguard-tools

diff --git a/config/cli/common/main/packages.additional b/config/cli/common/main/packages.additional
@@ -7,8 +7,11 @@ bash-completion
 bison
 btrfs-progs
 build-essential
+command-not-found
 cracklib-runtime
+device-tree-compiler
 dkms
+ethtool
 evtest
 expect
 f2fs-tools
@@ -37,7 +40,6 @@ libpam-systemd
 libproc-processtable-perl
 libwrap0-dev
 mc
-network-manager-openvpn
 nfs-common
 ntfs-3g
 pciutils
@@ -51,7 +53,8 @@ screen
 software-properties-common
 smartmontools
 stress
-sudo
+sysfsutils
+sysstat
 unattended-upgrades
 unicode-data
 unzip

diff --git a/config/cli/jammy/main/packages b/config/cli/jammy/main/packages
@@ -1,8 +1,6 @@
 alsa-utils
 bc
 bridge-utils
-chrony
-command-not-found
 console-setup
 cron
 curl
@@ -30,8 +28,6 @@ man-db
 mmc-utils
 ncurses-term
 nano
-netplan.io
-network-manager
 openssh-server
 parted
 psmisc

diff --git a/config/cli/noble/main/packages.additional b/config/cli/noble/main/packages.additional
@@ -37,7 +37,6 @@ libpam-systemd
 libproc-processtable-perl
 libwrap0-dev
 mc
-network-manager-openvpn
 nfs-common
 ntfs-3g
 pciutils

diff --git a/config/cli/sid/main/packages.additional b/config/cli/sid/main/packages.additional
@@ -37,7 +37,6 @@ libpam-systemd
 libproc-processtable-perl
 libwrap0-dev
 mc
-network-manager-openvpn
 nfs-common
 ntfs-3g
 pciutils

diff --git a/config/cli/trixie/main/packages.additional b/config/cli/trixie/main/packages.additional
@@ -37,7 +37,6 @@ libpam-systemd
 libproc-processtable-perl
 libwrap0-dev
 mc
-network-manager-openvpn
 nfs-common
 ntfs-3g
 pciutils

diff --git a/config/desktop/bookworm/environments/budgie/config_base/packages b/config/desktop/bookworm/environments/budgie/config_base/packages
@@ -88,7 +88,6 @@ libnotify-bin
 libplank1
 libplank-common
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxapp1
 libxcursor1
@@ -101,9 +100,6 @@ nemo-data
 nemo-fileroller
 nemo-font-manager
 nemo-gtkhash
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle

diff --git a/config/desktop/bookworm/environments/cinnamon/config_base/packages b/config/desktop/bookworm/environments/cinnamon/config_base/packages
@@ -76,10 +76,6 @@ nemo-data
 nemo-fileroller
 nemo-font-manager
 nemo-gtkhash
-network-manager-gnome
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle

diff --git a/config/desktop/bookworm/environments/gnome/config_base/packages b/config/desktop/bookworm/environments/gnome/config_base/packages
@@ -30,8 +30,6 @@ libpulsedsp
 gdm3
 lm-sensors
 nautilus
-network-manager-gnome
-network-manager-openvpn-gnome
 pavucontrol
 #printer-driver-all
 profile-sync-daemon

diff --git a/config/desktop/bookworm/environments/i3-wm/config_base/packages b/config/desktop/bookworm/environments/i3-wm/config_base/packages
@@ -77,7 +77,6 @@ libgsettings-qt1
 libjson-xs-perl
 libnotify-bin
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxcb-cursor0
 libxcursor1
@@ -87,8 +86,6 @@ lightdm-gtk-greeter-settings
 lightdm-settings
 lxappearance
 mousetweaks
-network-manager-openvpn-gnome
-network-manager-vpnc
 nitrogen
 numix-gtk-theme
 openprinting-ppds

diff --git a/config/desktop/bookworm/environments/kde-plasma/config_base/packages b/config/desktop/bookworm/environments/kde-plasma/config_base/packages
@@ -61,16 +61,12 @@ libgsettings-qt1
 libgtk2.0-bin
 libnotify-bin
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxcursor1
 sddm
 mesa-utils
 mousepad
 mousetweaks
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle

diff --git a/config/desktop/bookworm/environments/mate/config_base/packages b/config/desktop/bookworm/environments/mate/config_base/packages
@@ -76,7 +76,6 @@ mate-window-applets-common
 mate-window-buttons-applet
 mate-window-menu-applet
 mate-window-title-applet
-network-manager-gnome
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle

diff --git a/config/desktop/bookworm/environments/xfce/config_base/packages b/config/desktop/bookworm/environments/xfce/config_base/packages
@@ -52,7 +52,6 @@ libgtk2.0-bin
 libnotify-bin
 libpam-gnome-keyring
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxcursor1
 lightdm
@@ -61,10 +60,6 @@ lxtask
 mesa-utils
 mousepad
 mousetweaks
-network-manager-gnome
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle

diff --git a/config/desktop/bookworm/environments/xmonad/config_base/packages b/config/desktop/bookworm/environments/xmonad/config_base/packages
@@ -64,7 +64,6 @@ libgnome-bluetooth13
 libgsettings-qt1
 libnotify-bin
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxapp1
 libxcursor1
@@ -73,8 +72,6 @@ lightdm-gtk-greeter
 lightdm-gtk-greeter-settings
 lightdm-settings
 mousetweaks
-network-manager-openvpn-gnome
-network-manager-vpnc
 nitrogen
 numix-gtk-theme
 openprinting-ppds

diff --git a/config/desktop/common/environments/budgie/config_base/packages b/config/desktop/common/environments/budgie/config_base/packages
@@ -109,7 +109,6 @@ libnotify-bin
 libplank1
 libplank-common
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxcursor1
 gdm3
@@ -121,10 +120,6 @@ nemo-data
 nemo-fileroller
 nemo-font-manager
 nemo-gtkhash
-network-manager-config-connectivity-ubuntu
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-blue-gtk-theme
 numix-gtk-theme
 numix-icon-theme

diff --git a/config/desktop/common/environments/cinnamon/config_base/packages b/config/desktop/common/environments/cinnamon/config_base/packages
@@ -80,10 +80,6 @@ nemo-data
 nemo-fileroller
 nemo-font-manager
 nemo-gtkhash
-network-manager-gnome
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle

diff --git a/config/desktop/common/environments/deepin/config_base/packages b/config/desktop/common/environments/deepin/config_base/packages
@@ -119,7 +119,6 @@ libgsettings-qt1
 libgtk2.0-bin
 libnotify-bin
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxcursor1
 lightdm
@@ -128,10 +127,6 @@ lxtask
 mesa-utils
 mousepad
 mousetweaks
-network-manager-config-connectivity-ubuntu
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-blue-gtk-theme
 numix-gtk-theme
 numix-icon-theme

diff --git a/config/desktop/common/environments/enlightenment/config_base/packages b/config/desktop/common/environments/enlightenment/config_base/packages
@@ -85,18 +85,13 @@ libnotify-bin
 libplank1
 libplank-common
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxcursor1
 lightdm
 lxtask
 mesa-utils
 mousepad
 mousetweaks
-network-manager-config-connectivity-ubuntu
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-blue-gtk-theme
 numix-gtk-theme
 numix-icon-theme

diff --git a/config/desktop/common/environments/gnome/config_base/packages b/config/desktop/common/environments/gnome/config_base/packages
@@ -30,8 +30,6 @@ libnotify-bin
 gdm3
 lm-sensors
 nautilus
-network-manager-gnome
-network-manager-openvpn-gnome
 pavucontrol
 printer-driver-all
 profile-sync-daemon

diff --git a/config/desktop/common/environments/i3-wm/config_base/packages b/config/desktop/common/environments/i3-wm/config_base/packages
@@ -81,7 +81,6 @@ libgsettings-qt1
 libjson-xs-perl
 libnotify-bin
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxcb-cursor0
 libxcursor1
@@ -91,8 +90,6 @@ lightdm-gtk-greeter-settings
 lightdm-settings
 lxappearance
 mousetweaks
-network-manager-openvpn-gnome
-network-manager-vpnc
 nitrogen
 numix-gtk-theme
 openprinting-ppds

diff --git a/config/desktop/common/environments/kde-plasma/config_base/packages b/config/desktop/common/environments/kde-plasma/config_base/packages
@@ -81,17 +81,12 @@ libgsettings-qt1
 libgtk2.0-bin
 libnotify-bin
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxcursor1
 sddm
 mesa-utils
 mousepad
 mousetweaks
-network-manager-config-connectivity-ubuntu
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle

diff --git a/config/desktop/common/environments/mate/config_base/packages b/config/desktop/common/environments/mate/config_base/packages
@@ -81,7 +81,6 @@ libgsettings-qt1
 libgtk2.0-bin
 libnotify-bin
 libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
 libwmf0.2-7-gtk
 libxcursor1
 lightdm
@@ -149,10 +148,6 @@ mate-window-title-applet
 mesa-utils
 mousepad
 mousetweaks
-network-manager-config-connectivity-ubuntu
-network-manager-openvpn
-network-manager-ssh
-network-manager-vpnc
 numix-gtk-theme
 numix-icon-theme
 numix-icon-theme-circle