Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=aeab4079638ded08581e78c21ec1a40eb3cc7f2d
commit aeab4079638ded08581e78c21ec1a40eb3cc7f2d Author: bouleetbil <bouleet...@frogdev.info> Date: Wed Dec 1 22:58:01 2010 +0000 networkmanager-0.8.2-2-i686 *switch to systemd diff --git a/source/network-extra/networkmanager/FrugalBuild b/source/network-extra/networkmanager/FrugalBuild index 5ab3430..5ff9aa7 100644 --- a/source/network-extra/networkmanager/FrugalBuild +++ b/source/network-extra/networkmanager/FrugalBuild @@ -4,7 +4,7 @@ pkgname=networkmanager _F_gnome_name=NetworkManager pkgver=0.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Network Management daemon" depends=('wireless_tools' 'hal' 'iproute2' 'dhcpcd>=5.1.3' 'nss' \ 'libnl' 'ppp' 'wpa_supplicant' 'iptables' 'polkit' 'libgudev') @@ -16,11 +16,11 @@ Finclude gnome backup=('etc/NetworkManager/nm-system-settings.conf') source=($source \ nm-system-settings.conf \ - dbus-acces.diff rc.networkmanager) + dbus-acces.diff NetworkManager.service) sha1sums=('2c9a9f0317d2ad4fd8a05631211cfd6040070f8e' \ '49ba558d20f5ca5a201e027e13b878dd5ac3569c' \ '7cfbc5ae73f64ec47fade7b089535c7acbe1eb3e' \ - '955eed2eb78903fb06b33a1bc85f444c8085757d') + '7a78298c316baf43f897aca3116a3b1d99dc4e1d') _F_cd_path=$_F_gnome_name-$pkgver build() { @@ -33,7 +33,8 @@ build() { Fmkdir etc/NetworkManager/dispatcher.d Fmkdir etc/NetworkManager Fcp nm-system-settings.conf etc/NetworkManager/nm-system-settings.conf - Frcd2 networkmanager + Fmkdir etc/systemd/system/ + Fcp NetworkManager.service etc/systemd/system/ } # optimization OK diff --git a/source/network-extra/networkmanager/NetworkManager.service b/source/network-extra/networkmanager/NetworkManager.service new file mode 100644 index 0000000..7c8984a --- /dev/null +++ b/source/network-extra/networkmanager/NetworkManager.service @@ -0,0 +1,11 @@ +[Unit] +Description=Network Manager +After=syslog.target + +[Service] +Type=dbus +BusName=org.freedesktop.NetworkManager +ExecStart=/usr/sbin/NetworkManager --no-daemon + +[Install] +WantedBy=multi-user.target diff --git a/source/network-extra/networkmanager/rc.networkmanager b/source/network-extra/networkmanager/rc.networkmanager deleted file mode 100644 index 3e0f566..0000000 --- a/source/network-extra/networkmanager/rc.networkmanager +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -# (c) 2009 bouleetbil <bouleet...@frogdev.info> -# rc.networkmanager for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 99 02 -# description: Network Manager. - -source /lib/initscripts/functions -TEXTDOMAIN=networkmanager -TEXTDOMAINDIR=/lib/initscripts/messages -daemon="networkmanager" - -actions=(restart start status stop) - -pid="pidof /usr/sbin/NetworkManager 2> /dev/null" - - -rc_start() -{ - start_msg - if [ -z "$(eval $pid)" ]; then - /usr/sbin/NetworkManager -- 2>/dev/null 1>/dev/null - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ ! -z "$(eval $pid)" ] ;then - killall /usr/sbin/NetworkManager - ok $? - else - ok 999 - fi -} - -rc_exec $1 - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git