Skip to content

Commit

Permalink
Replace NetworkManager by Connman.
Browse files Browse the repository at this point in the history
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 void-linux#296.
  • Loading branch information
KF-Art committed Nov 21, 2022
1 parent c2340c6 commit a37b07d
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build-x86-images.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion dracut/vmklive/adduser.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
3 changes: 1 addition & 2 deletions includedir/lxqt/etc/calamares/modules/services-runit.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ services:
- acpid
- dbus
- bluetoothd
- NetworkManager
- connmand
- lightdm
- sddm
- polkitd
- cupsd
- cups-browsed
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Desktop Entry]
Exec=$HOME/.enable-connman-gtk-tray
Name=Enable Connman GTK tray icon
Type=Application
Version=1.0
7 changes: 7 additions & 0 deletions includedir/lxqt/etc/skel/.enable-connman-gtk-tray
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions includedir/lxqt/etc/xdg/autostart/connman-gtk.desktop
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit a37b07d

Please sign in to comment.