diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2021-01-26 19:23:31 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2021-01-26 19:23:31 +0000 |
| commit | cefa99725b234fe805d3cc339a190b4dfb74a325 (patch) | |
| tree | ca95bcfbf2dcc5cf67c86bdf37a2f2beb38ff686 /config | |
| parent | b0933d64fb3b3db20d10b4c6f3f1a07de43b5e72 (diff) | |
| download | draklive-config-cefa99725b234fe805d3cc339a190b4dfb74a325.tar draklive-config-cefa99725b234fe805d3cc339a190b4dfb74a325.tar.gz draklive-config-cefa99725b234fe805d3cc339a190b4dfb74a325.tar.bz2 draklive-config-cefa99725b234fe805d3cc339a190b4dfb74a325.tar.xz draklive-config-cefa99725b234fe805d3cc339a190b4dfb74a325.zip | |
Switch to using NetworkManager for Xfce.
Thus avoiding the bug in net_applet (mga#27795).
Diffstat (limited to 'config')
| -rw-r--r-- | config/build.cfg | 17 |
1 files changed, 10 insertions, 7 deletions
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", |