diff --git a/srcpkgs/wicd/INSTALL b/srcpkgs/wicd/INSTALL index 37b69435a15..ee3f13c6979 100644 --- a/srcpkgs/wicd/INSTALL +++ b/srcpkgs/wicd/INSTALL @@ -13,8 +13,8 @@ Please note that wicd does not require to have dhcpcd and/or wpa_supplicant services running at boot. If you are using them at boot, please disable them before using wicd. You can do that with: -$ /etc/init.d/ stop -$ rc-update del default +$ systemctl stop dhcpcd.service wpa_supplicant.service +$ systemctl disable dhcpcd.service wpa_supplicant.service ATTENTION: to make wicd work for your user, it must be a member of the 'users' group. diff --git a/srcpkgs/wicd/files/wicd.rc b/srcpkgs/wicd/files/wicd.rc deleted file mode 100644 index 4370e768312..00000000000 --- a/srcpkgs/wicd/files/wicd.rc +++ /dev/null @@ -1,9 +0,0 @@ -#!/sbin/runscript - -command=/usr/sbin/wicd -pidfile=/var/run/wicd/wicd.pid - -depend() -{ - need dbus -} diff --git a/srcpkgs/wicd/files/wicd.service b/srcpkgs/wicd/files/wicd.service new file mode 100644 index 00000000000..4ae9e4317b6 --- /dev/null +++ b/srcpkgs/wicd/files/wicd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Wicd Network Manager + +[Service] +Type=dbus +BusName=org.wicd.daemon +ExecStart=/usr/sbin/wicd -f +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template index af3b1af2921..90638c212b8 100644 --- a/srcpkgs/wicd/template +++ b/srcpkgs/wicd/template @@ -1,7 +1,7 @@ # Template file for 'wicd' pkgname=wicd version=1.7.0 -revision=3 +revision=4 patch_args="-Np1" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" build_style=custom-install @@ -32,8 +32,8 @@ noarch=yes conf_files=" /etc/dbus-1/system.d/wicd.conf /etc/wicd/encryption/templates/active" +systemd_services="wicd.service" gtk_iconcache_dirs="/usr/share/icons/hicolor" -openrc_services="wicd default false" pycompile_module="wicd" Add_dependency full dbus-python @@ -55,7 +55,7 @@ do_install() --suspend=/usr/share/wicd/scripts python setup.py install --root=${DESTDIR} - vinstall ${FILESDIR}/wicd.rc 755 etc/init.d wicd + vinstall ${FILESDIR}/wicd.service 644 lib/systemd/system vinstall ${FILESDIR}/wicd.desktop 644 usr/share/applications vmkdir usr/lib/wicd vcopy "build/lib/wicd/*.py" usr/lib/wicd