From cefa99725b234fe805d3cc339a190b4dfb74a325 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Tue, 26 Jan 2021 19:23:31 +0000 Subject: Switch to using NetworkManager for Xfce. Thus avoiding the bug in net_applet (mga#27795). --- config/build.cfg | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'config') diff --git a/config/build.cfg b/config/build.cfg index a3e1e1f..3278976 100644 --- a/config/build.cfg +++ b/config/build.cfg @@ -131,6 +131,7 @@ my $config = { if_($has_xfce, 'task-xfce', + 'networkmanager-applet', ), ], exclude_packages => [ @@ -281,13 +282,6 @@ my $config = { # Fix permissions to enable GDM to rerun if the user logs out. "chown -R gdm:gdm /var/lib/gdm", - # Switch to NetworkManager. - "systemctl -q disable network", - "systemctl -q disable network-up", - "systemctl -q enable NetworkManager.service", - "systemctl -q enable NetworkManager-wait-online.service", - "echo 'AUTOSTART=FALSE' > /home/live/.net_applet", - # Enable the TopIcons extension "mkdir -p /etc/dconf/db/local.d", "echo -e \"[org/gnome/shell]\nenabled-extensions=['TopIcons\@phocean.net']\" > /etc/dconf/db/local.d/00-extensions", @@ -312,6 +306,15 @@ my $config = { "chmod 750 /home/$default_user/Desktop/draklive-install.desktop", ), + if_($has_gnome || $has_xfce, + # Switch to NetworkManager. + "systemctl -q disable network", + "systemctl -q disable network-up", + "systemctl -q enable NetworkManager.service", + "systemctl -q enable NetworkManager-wait-online.service", + "echo 'AUTOSTART=FALSE' > /home/live/.net_applet", + ), + # Fix permissions for copied files. "chown -R $default_user.$default_user /home/$default_user", -- cgit v1.2.1