]> git.pld-linux.org Git - packages/rc-scripts.git/commitdiff
- outdated
authorJakub Bogusz <qboosh@pld-linux.org>
Wed, 12 Dec 2007 21:57:31 +0000 (21:57 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    rc-scripts-dev_alias.patch -> 1.8
    rc-scripts-fuser.patch -> 1.2
    rc-scripts-sleep.patch -> 1.3

rc-scripts-dev_alias.patch [deleted file]
rc-scripts-fuser.patch [deleted file]
rc-scripts-sleep.patch [deleted file]

diff --git a/rc-scripts-dev_alias.patch b/rc-scripts-dev_alias.patch
deleted file mode 100644 (file)
index edc68d8..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
---- ./sysconfig/network-scripts/ifdown.org     2005-03-29 20:07:36.559401832 +0200
-+++ ./sysconfig/network-scripts/ifdown 2005-03-29 20:09:44.281985048 +0200
-@@ -109,8 +109,12 @@
-               ip link set ${DEVICE} down
-       fi
- else
--      ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
--      ip link set ${DEVICE} down
-+      if [ -n "${SUBDEVICE}" ]; then
-+              ip addr del ${IP4ADDR} label ${SUBDEVICE} dev ${DEVICE}
-+      else
-+              ip addr flush dev ${DEVICE} 2>&1 | grep -v "Nothing to flush"
-+              ip link set ${DEVICE} down
-+      fi
- fi
- if [ "$HANDLING" = "4" ]; then
---- ./sysconfig/network-scripts/functions.network.org  2005-03-29 20:10:14.405405592 +0200
-+++ ./sysconfig/network-scripts/functions.network      2005-03-29 20:13:29.813699016 +0200
-@@ -148,7 +148,7 @@
- {
-       # detect network device type (ie. dummy, eth for dummy0, eth0 ..)
-       if [ -z "$DEVICETYPE" ]; then
--              DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[0-9]*\.?[0-9]*$/,NUL); print $0 } ')
-+              DEVICETYPE=$(echo $DEVICE | awk ' { gsub(/[\.:]?[0-9]*[\.:]?[0-9]*$/,NUL); print $0 } ')
-       fi
- # Setup DEVICETYPE for special cases.
-@@ -157,6 +157,7 @@
- fi
-       # real name of device (ie. is eth0 for eth0,eth0:1,eth0:alias)
-+      SUBDEVICE=$(echo "$DEVICE" | egrep "([0-9]+:[0-9]+)" )
-       DEVICE=$(echo $DEVICE | awk ' { gsub(/:.*$/,NUL); print $0 } ')
-       eval IP4ADDR="\$IPADDR${IP4_PRIM_IF:-}"
---- ./sysconfig/network-scripts/ifup.org       2005-03-29 20:14:19.329171520 +0200
-+++ ./sysconfig/network-scripts/ifup   2005-03-29 20:16:31.832028024 +0200
-@@ -176,10 +176,14 @@
-                       IP4ADDROPT="brd + ${IP4ADDROPT}"
-               fi
-+              if [ -n "${SUBDEVICE}" ]; then
-+                      ALIAS="label ${SUBDEVICE}"
-+              fi
-+
-               if [ -n "$REMIP" ]; then
--                      ip addr add ${IP4ADDR} peer ${REMIP} dev ${DEVICE} ${IP4ADDROPT}
-+                      ip addr add ${IP4ADDR} peer ${REMIP} ${ALIAS} dev ${DEVICE} ${IP4ADDROPT}
-               else
--                      ip addr add ${IP4ADDR} dev ${DEVICE} ${IP4ADDROPT}
-+                      ip addr add ${IP4ADDR} ${ALIAS} dev ${DEVICE} ${IP4ADDROPT}
-               fi
-       fi
diff --git a/rc-scripts-fuser.patch b/rc-scripts-fuser.patch
deleted file mode 100644 (file)
index da069c3..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- rc-scripts-0.4.1.6/rc.d/rc.shutdown        2007-05-14 18:44:37.000000000 +0200
-+++ rc-scripts-0.4.1.6/rc.d/rc.shutdown        2007-05-14 18:43:57.000000000 +0200
-@@ -84,7 +84,7 @@
-               sleep 2
-               remaining=$(awk '!/(^#| proc | loopfs | devfs | devpts | shm | iso9660 | ramfs | tmpfs | sysfs | securityfs | squashfs |^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts)
-               [ -z "$remaining" ] && break
--              /sbin/fuser -k -m $sig $remaining > /dev/null
-+              fuser -k -m $sig $remaining > /dev/null
-               sleep 5
-               retry=$(($retry-1))
-               sig=-9
diff --git a/rc-scripts-sleep.patch b/rc-scripts-sleep.patch
deleted file mode 100644 (file)
index a476b7b..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uNr rc-scripts-0.4.1.0.orig/sysconfig/network-scripts/ifup rc-scripts-0.4.1.0/sysconfig/network-scripts/ifup
---- rc-scripts-0.4.1.0.orig/sysconfig/network-scripts/ifup     2006-08-31 09:53:06.000000000 +0000
-+++ rc-scripts-0.4.1.0/sysconfig/network-scripts/ifup  2006-10-07 03:14:56.000000000 +0000
-@@ -91,8 +91,12 @@
-       exit 0
- fi
-+if  [ -z "$SLEEP_SCAN_INT" ]; then
-+      SLEEP_SCAN_INT=0
-+fi
-+
- if [ -n "$MACADDR" ]; then
--      ip link set ${DEVICE} address ${MACADDR}
-+      ip link set ${DEVICE} address ${MACADDR} && sleep ${SLEEP_SCAN_INT}
- fi
- ip link set ${DEVICE} multicast ${MULTICAST} ${ARP} down
This page took 0.031201 seconds and 4 git commands to generate.