From a37b07d428d6bf23bcd6dd44fcc0acb480b72426 Mon Sep 17 00:00:00 2001 From: KF-Art Date: Sun, 20 Nov 2022 21:37:55 -0500 Subject: [PATCH] Replace NetworkManager by Connman. New dracut update fails when building initramfs for live ISO when NetworkManager is present, as it now depends on systemd hook. Void Linux didn't take a decision yet about what they'll do about this, but we decided to nip the problem in the bud dropping NetworkManager in favor of Connman. connman-gtk GUI was chosen even for Qt desktop environments, because is easier to understand for new users than cmst. Fixes #296. --- build-x86-images.sh.in | 4 ++-- dracut/vmklive/adduser.sh | 2 +- .../lxqt/etc/calamares/modules/services-runit.conf | 3 +-- .../.config/autostart/enable-connman-gtk-tray.desktop | 5 +++++ includedir/lxqt/etc/skel/.enable-connman-gtk-tray | 7 +++++++ includedir/lxqt/etc/xdg/autostart/connman-gtk.desktop | 9 +++++++++ 6 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 includedir/lxqt/etc/skel/.config/autostart/enable-connman-gtk-tray.desktop create mode 100755 includedir/lxqt/etc/skel/.enable-connman-gtk-tray create mode 100644 includedir/lxqt/etc/xdg/autostart/connman-gtk.desktop diff --git a/build-x86-images.sh.in b/build-x86-images.sh.in index 682bb42696..0e188c9ad0 100644 --- a/build-x86-images.sh.in +++ b/build-x86-images.sh.in @@ -75,7 +75,7 @@ esac case $variant in base) ;; xfce) - PKGS="$PKGS $XORG_PKGS $THEMES_PKGS $ARCH_PKGS $CEREUS_BASEPKGS lightdm lightdm-gtk3-greeter lightdm-gtk-greeter-settings xfce4 gnome-themes-standard gnome-keyring network-manager-applet gvfs-afc gvfs-mtp gvfs-smb udisks2 xfce4-whiskermenu-plugin xfce4-pulseaudio-plugin xfce4-clipman-plugin thunar-archive-plugin evince xarchiver" + PKGS="$PKGS $XORG_PKGS $THEMES_PKGS $ARCH_PKGS $CEREUS_BASEPKGS lightdm lightdm-gtk3-greeter lightdm-gtk-greeter-settings xfce4 gnome-themes-standard gnome-keyring connman-gtk gvfs-afc gvfs-mtp gvfs-smb udisks2 xfce4-whiskermenu-plugin xfce4-pulseaudio-plugin xfce4-clipman-plugin thunar-archive-plugin evince xarchiver" ;; cinnamon) PKGS="$PKGS $XORG_PKGS $THEMES_PKGS $ARCH_PKGS $CEREUS_BASEPKGS lightdm lightdm-gtk3-greeter lightdm-gtk-greeter-settings cinnamon gnome-keyring colord tilix gvfs-afc gvfs-mtp gvfs-smb udisks2 blueman eog gnome-screenshot qt5ct rhythmbox xed-xapps xdg-user-dirs evince galculator-gtk3 nemo{,-emblems,-extensions,-fileroller,-image-converter,-preview,-python,-terminal,compare,audio-tab} clipit xviewer" @@ -84,7 +84,7 @@ esac PKGS="$PKGS $XORG_PKGS $THEMES_PKGS $ARCH_PKGS $CEREUS_BASEPKGS kde5 konsole dolphin sddm print-manager ark strawberry kate5 kcalc udisks2 okular spectacle" ;; lxqt) - PKGS="$PKGS $XORG_PKGS $THEMES_PKGS $ARCH_PKGS $CEREUS_BASEPKGS lxqt gvfs-afc gvfs-mtp gvfs-smb udisks2 lightdm lightdm-gtk3-greeter lightdm-gtk-greeter-settings CopyQ blueman strawberry flameshot midori galculator-gtk3 qpdfview xed-xapps picom network-manager-applet pasystray-git licorice-openbox-theme-cereus qterminal-cereus-colorscheme" + PKGS="$PKGS $XORG_PKGS $THEMES_PKGS $ARCH_PKGS $CEREUS_BASEPKGS lxqt gvfs-afc gvfs-mtp gvfs-smb udisks2 lightdm lightdm-gtk3-greeter lightdm-gtk-greeter-settings CopyQ blueman strawberry flameshot midori galculator-gtk3 qpdfview xed-xapps picom connman-gtk pasystray-git licorice-openbox-theme-cereus qterminal-cereus-colorscheme" ;; # UNOFFICIAL EDITIONS fluxbox) diff --git a/dracut/vmklive/adduser.sh b/dracut/vmklive/adduser.sh index 59926afcdc..f5fd13ec8e 100644 --- a/dracut/vmklive/adduser.sh +++ b/dracut/vmklive/adduser.sh @@ -24,7 +24,7 @@ fi # Create new user and remove password. We'll use autologin by default. chroot ${NEWROOT} groupadd autologin -chroot ${NEWROOT} useradd -m -c $USERNAME -G audio,video,wheel,autologin -s $USERSHELL $USERNAME +chroot ${NEWROOT} useradd -m -c $USERNAME -G audio,video,wheel,network,autologin -s $USERSHELL $USERNAME chroot ${NEWROOT} passwd -d $USERNAME >/dev/null 2>&1 # Setup default root/user password (cereus). diff --git a/includedir/lxqt/etc/calamares/modules/services-runit.conf b/includedir/lxqt/etc/calamares/modules/services-runit.conf index 7e656ca028..b8d849eafb 100644 --- a/includedir/lxqt/etc/calamares/modules/services-runit.conf +++ b/includedir/lxqt/etc/calamares/modules/services-runit.conf @@ -5,9 +5,8 @@ services: - acpid - dbus - bluetoothd - - NetworkManager + - connmand - lightdm - - sddm - polkitd - cupsd - cups-browsed diff --git a/includedir/lxqt/etc/skel/.config/autostart/enable-connman-gtk-tray.desktop b/includedir/lxqt/etc/skel/.config/autostart/enable-connman-gtk-tray.desktop new file mode 100644 index 0000000000..47e498cc8e --- /dev/null +++ b/includedir/lxqt/etc/skel/.config/autostart/enable-connman-gtk-tray.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Exec=$HOME/.enable-connman-gtk-tray +Name=Enable Connman GTK tray icon +Type=Application +Version=1.0 diff --git a/includedir/lxqt/etc/skel/.enable-connman-gtk-tray b/includedir/lxqt/etc/skel/.enable-connman-gtk-tray new file mode 100755 index 0000000000..52db409cb3 --- /dev/null +++ b/includedir/lxqt/etc/skel/.enable-connman-gtk-tray @@ -0,0 +1,7 @@ +#!/bin/sh +for key in status-icon-enabled launch-to-tray; do + gsettings set net.connman.gtk ${key} true +done + +rm $HOME/.enable-connman-gtk-tray +rm $HOME/.config/autostart/enable-connman-gtk-tray.desktop diff --git a/includedir/lxqt/etc/xdg/autostart/connman-gtk.desktop b/includedir/lxqt/etc/xdg/autostart/connman-gtk.desktop new file mode 100644 index 0000000000..33e20d32fa --- /dev/null +++ b/includedir/lxqt/etc/xdg/autostart/connman-gtk.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Exec=connman-gtk --tray +Name=Connman network manager +Type=Application +Version=1.0 +X-LXQt-Need-Tray=true +X-GNOME-Autostart-enabled=true +X-GNOME-Autostart-Delay=5 +X-MATE-Autostart-Delay=2