Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=e4aaab409b7b17e4991e77ee8239961c0a995ede

commit e4aaab409b7b17e4991e77ee8239961c0a995ede
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Fri Feb 25 18:29:50 2011 +0100

networkmanager-0.8.2-9-x86_64
*keep only systemd support

diff --git a/source/network/networkmanager/FrugalBuild 
b/source/network/networkmanager/FrugalBuild
index 6ae2260..3f06fe6 100644
--- a/source/network/networkmanager/FrugalBuild
+++ b/source/network/networkmanager/FrugalBuild
@@ -6,7 +6,7 @@ USE_SYSTEMD=${USE_SYSTEMD:-"y"}
pkgname=networkmanager
_F_gnome_name=NetworkManager
pkgver=0.8.2
-pkgrel=8
+pkgrel=9
pkgdesc="Network Management daemon"
depends=('wireless_tools' 'hal' 'iproute2' 'dhcpcd>=5.1.3' 'nss' \
'libnl' 'ppp' 'wpa_supplicant' 'iptables' 'polkit' 'libgudev')
@@ -18,11 +18,10 @@ Finclude gnome
backup=('etc/NetworkManager/nm-system-settings.conf')
source=($source \
nm-system-settings.conf \
-       dbus-acces.diff rc.networkmanager fixHost.diff)
+       dbus-acces.diff fixHost.diff)
sha1sums=('2c9a9f0317d2ad4fd8a05631211cfd6040070f8e' \
'9a21560c5d65165daaae5996fa3d41b85d257b42' \
'7cfbc5ae73f64ec47fade7b089535c7acbe1eb3e' \
-          '955eed2eb78903fb06b33a1bc85f444c8085757d' \
'900c5f16b07523b2a43818c55dbcabb63703c802')
_F_cd_path=$_F_gnome_name-$pkgver

@@ -40,7 +39,6 @@ build() {
Fmkdir etc/NetworkManager/dispatcher.d
Fmkdir etc/NetworkManager
Fcp nm-system-settings.conf etc/NetworkManager/nm-system-settings.conf
-       Frcd2 networkmanager
if Fuse $USE_SYSTEMD; then
# don't run old sysv init script with different name when using systemd
Fmv /lib/systemd/system/NetworkManager.service 
/lib/systemd/system/networkmanager.service
diff --git a/source/network/networkmanager/networkmanager.install 
b/source/network/networkmanager/networkmanager.install
index 84839a7..608fbf1 100644
--- a/source/network/networkmanager/networkmanager.install
+++ b/source/network/networkmanager/networkmanager.install
@@ -1,6 +1,5 @@
post_install()
{
-       chkconfig --add rc.networkmanager
systemctl daemon-reload >/dev/null 2>&1
systemctl enable networkmanager.service >/dev/null 2>&1
}
@@ -15,7 +14,6 @@ pre_remove()
{
systemctl stop networkmanager.service >/dev/null 2>&1
systemctl disable networkmanager.service >/dev/null 2>&1
-       chkconfig --del rc.networkmanager
}

post_remove()
diff --git a/source/network/networkmanager/rc.networkmanager 
b/source/network/networkmanager/rc.networkmanager
deleted file mode 100644
index 3e0f566..0000000
--- a/source/network/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

Reply via email to