[arch-commits] CVS update of arch/build/base/initscripts (PKGBUILD netcfg network)

[James Rayner]

    Date: Wednesday, May 9, 2007 @ 20:18:05
  Author: james
    Path: /home/cvs-arch/arch/build/base/initscripts

Modified: PKGBUILD (1.169 -> 1.170) netcfg (1.14 -> 1.15)
          network (1.32 -> 1.33)

upgpkg: initscripts 0.8-8
fixing flyspray #7004 #6859, change in dhcpcd state directory.


----------+
 PKGBUILD |   21 ++++++++++-----------
 netcfg   |    6 +++---
 network  |    6 +++---
 3 files changed, 16 insertions(+), 17 deletions(-)


Index: arch/build/base/initscripts/PKGBUILD
diff -u arch/build/base/initscripts/PKGBUILD:1.169 arch/build/base/initscripts/PKGBUILD:1.170
--- arch/build/base/initscripts/PKGBUILD:1.169	Sun Apr 22 09:37:53 2007
+++ arch/build/base/initscripts/PKGBUILD	Wed May  9 20:18:05 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.169 2007/04/22 13:37:53 tpowa Exp $
+# $Id: PKGBUILD,v 1.170 2007/05/10 00:18:05 james Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=initscripts
 pkgver=0.8
-pkgrel=7
+pkgrel=8
 pkgdesc="System initialization/bootup scripts"
 arch=(i686 x86_64)
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
@@ -10,15 +10,6 @@
 source=(functions inittab rc.conf rc.local rc.multi rc.shutdown \
         rc.single rc.sysinit network minilogd.c isatty.c netfs makedevs \
         netcfg profile-template rc.local.shutdown)
-md5sums=('ec6e98cf3d2e4dfe588175a61015058c' 'b1d53aba3997e2a85cc887da45ec8c0f'\
-         '9151763518526dffe33a2483b2e9dec3' 'bd236a57bc00aa4727b98c5ae401c457'\
-         '3c1f9e4cadc877a0ac65de18b0b7df2c' '916fcfb9277f2188322b5bf9737810a0'\
-         'df82de02bc276ed82ead63e776406602' '4148312cd768bd56b73ed06f206ebdcc'\
-         '99806e860138ff0dbba5be4b6bfaaa60' 'f638d2a7ecbdb1d0207023ef41621586'\
-         'fba6fca3508578fc8b3c0ae1dd509373' '9ba9d13c648bc3e0fb4e2740e97cecff'\
-         '324f1d8e26d31af0edb172319b839f82' '5c001e89db6705d082521db0623531fc'\
-         'c1051c3e6fc2accd0d942c246e14a260' '669ce6d766dd9deb86686219f3763fe4')
-
 build() {
   mkdir -p $startdir/pkg/etc/{rc.d,conf.d}
   install -D -m644 functions $startdir/pkg/etc/rc.d/functions
@@ -37,3 +28,11 @@
   install -D -m755 makedevs $startdir/pkg/sbin/makedevs
   install -D -m600 profile-template $startdir/pkg/etc/network-profiles/template
 }
+md5sums=('ec6e98cf3d2e4dfe588175a61015058c' 'b1d53aba3997e2a85cc887da45ec8c0f'\
+         '9151763518526dffe33a2483b2e9dec3' 'bd236a57bc00aa4727b98c5ae401c457'\
+         '3c1f9e4cadc877a0ac65de18b0b7df2c' '916fcfb9277f2188322b5bf9737810a0'\
+         'df82de02bc276ed82ead63e776406602' '4148312cd768bd56b73ed06f206ebdcc'\
+         'af0896125a451c16cda0b18b416784b9' 'f638d2a7ecbdb1d0207023ef41621586'\
+         'fba6fca3508578fc8b3c0ae1dd509373' '9ba9d13c648bc3e0fb4e2740e97cecff'\
+         '324f1d8e26d31af0edb172319b839f82' '2d308ca2e8efd2d3e9b217575db03390'\
+         'c1051c3e6fc2accd0d942c246e14a260' '669ce6d766dd9deb86686219f3763fe4')
Index: arch/build/base/initscripts/netcfg
diff -u arch/build/base/initscripts/netcfg:1.14 arch/build/base/initscripts/netcfg:1.15
--- arch/build/base/initscripts/netcfg:1.14	Fri Jul 21 15:40:00 2006
+++ arch/build/base/initscripts/netcfg	Wed May  9 20:18:05 2007
@@ -55,8 +55,8 @@
 	if [ "$IFOPTS" = "dhcp" -o "$IFOPTS" = "DHCP" ]; then
 		# if the dhcp client received an unlimited lease then it just exits,
 		# so check for .pid file before trying to kill it.
-		if [ -f /etc/dhcpc/dhcpcd-${INTERFACE}.pid ]; then
-			kill `cat /etc/dhcpc/dhcpcd-${INTERFACE}.pid`
+		if [ -f /var/run/dhcpcd-${INTERFACE}.pid ]; then
+			kill `cat /var/run/dhcpcd-${INTERFACE}.pid`
 		fi
 	fi
 
@@ -147,7 +147,7 @@
 
 	if [ "$IFOPTS" = "dhcp" -o "$IFOPTS" = "DHCP" ]; then
 		# remove the .pid file if it exists
-		rm -f /etc/dhcpc/dhcpcd-${INTERFACE}.{pid,cache} >/dev/null 2>&1
+		rm -f /var/run/dhcpcd-${INTERFACE}.{pid,cache} >/dev/null 2>&1
 		dhcpcd $DHCPCD_ARGS $INTERFACE
 		[ $? -ne 0 ] && stat_fail && return
 	else
Index: arch/build/base/initscripts/network
diff -u arch/build/base/initscripts/network:1.32 arch/build/base/initscripts/network:1.33
--- arch/build/base/initscripts/network:1.32	Wed Jun 28 13:27:48 2006
+++ arch/build/base/initscripts/network	Wed May  9 20:18:05 2007
@@ -41,7 +41,7 @@
 	eval ifcfg="\$${1}"
 	if [ "$ifcfg" = "dhcp" ]; then
 		# remove the .pid file if it exists
-		rm -f /etc/dhcpc/dhcpcd-${1}.{pid,cache} >/dev/null 2>&1
+		rm -f /var/run/dhcpcd-${1}.{pid,cache} >/dev/null 2>&1
 		/sbin/dhcpcd $DHCPCD_ARGS ${1}
 	else
 		/sbin/ifconfig $ifcfg
@@ -57,8 +57,8 @@
 	fi
 	eval ifcfg="\$${1}"
 	if [ "$ifcfg" = "dhcp" ]; then
-		if [ -f /etc/dhcpc/dhcpcd-${1}.pid ]; then
-			kill `cat /etc/dhcpc/dhcpcd-${1}.pid`
+		if [ -f /var/run/dhcpcd-${1}.pid ]; then
+			kill `cat /var/run/dhcpcd-${1}.pid`
 		else
 			# No .pid file, just bring the interface itself down
 			/sbin/ifconfig ${1} down