summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2022-10-22 22:43:38 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2022-10-23 13:13:41 +0100
commit64d839f2587e0bce66da7d1295a6dfb66c6a4d51 (patch)
tree2e6e590440b3275c7b491a1fb0e7c00cc2ae7709
parent24918bbe44801255f493558997578f996404a62f (diff)
downloaddraklive-config-64d839f2587e0bce66da7d1295a6dfb66c6a4d51.tar
draklive-config-64d839f2587e0bce66da7d1295a6dfb66c6a4d51.tar.gz
draklive-config-64d839f2587e0bce66da7d1295a6dfb66c6a4d51.tar.bz2
draklive-config-64d839f2587e0bce66da7d1295a6dfb66c6a4d51.tar.xz
draklive-config-64d839f2587e0bce66da7d1295a6dfb66c6a4d51.zip
Use NetworkManager with all DEs.
network-scripts is deprecated and unmaintained.
-rw-r--r--config/build.cfg21
1 files changed, 10 insertions, 11 deletions
diff --git a/config/build.cfg b/config/build.cfg
index 988f091..7b5f3c7 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -127,6 +127,7 @@ my $config = {
if_($has_plasma,
'task-plasma5',
+ 'plasma-applet-nm',
),
if_($has_xfce,
@@ -305,17 +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",
- # Don't try to get a hostname by reverse DNS - it will most likely fail
- # and set the hostname to linux.local.
- "echo 'hostname-mode=dhcp' >> /etc/NetworkManager/NetworkManager.conf",
- ),
+ # 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",
+ # Don't try to get a hostname by reverse DNS - it will most likely fail
+ # and set the hostname to linux.local.
+ "echo 'hostname-mode=dhcp' >> /etc/NetworkManager/NetworkManager.conf",
# Fix permissions for copied files.
"chown -R $default_user:$default_user /home/$default_user",