summaryrefslogtreecommitdiff
path: root/ifupdown
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-04-30 09:28:52 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-04-30 09:28:52 +0000
commit7e1281c23961f4863273d59bbf9fd48d80c586bd (patch)
tree0b3f1a0fba93e4c4c7de9f3d174ca229325227ee /ifupdown
parent953194f40aecf3ad428b845251be61123003a4fc (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages 2004/04/30 11:28:40+02:00 uni-frankfurt.de!mickey fix ifupdown. patch courtesy Sébastien Bernard BKrev: 40921c54z9H0lPXIfPi4n7JxtMbtRQ
Diffstat (limited to 'ifupdown')
-rw-r--r--ifupdown/ifupdown-0.6.4/udhcpc.patch26
-rw-r--r--ifupdown/ifupdown_0.6.4.oe3
2 files changed, 27 insertions, 2 deletions
diff --git a/ifupdown/ifupdown-0.6.4/udhcpc.patch b/ifupdown/ifupdown-0.6.4/udhcpc.patch
index e69de29bb2..39a6b3349d 100644
--- a/ifupdown/ifupdown-0.6.4/udhcpc.patch
+++ b/ifupdown/ifupdown-0.6.4/udhcpc.patch
@@ -0,0 +1,26 @@
+--- ifupdown/inet.defn.orig 2004-04-29 20:16:07.000000000 +0200
++++ ifupdown/inet.defn 2004-04-29 20:16:13.000000000 +0200
+@@ -81,8 +81,7 @@
+ elsif (execable("/sbin/dhclient"))
+ pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
+ elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100))
+- udhcpc -n -p /var/run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
+- [[-c %clientid%]] \
++ udhcpc -b -p /var/run/udhcpc.%iface%.pid -i %iface% -H `cat /etc/hostname` \
+ elsif (execable("/sbin/udhcpc") && mylinuxver() >= mylinux(2,2,0))
+ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] \
+ [[-l %leasetime%]] %iface% \
+@@ -91,11 +90,11 @@
+ down
+ dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/run/dhclient.%iface%.leases %iface% \
+ if (execable("/sbin/dhclient3"))
+- cat /var/run/dhclient.%iface%.pid | xargs -i kill -TERM {} \
++ kill -TERM `cat /var/run/dhclient.%iface%.pid` \
+ elsif (execable("/sbin/dhclient"))
+ pump -i %iface% -r \
+ elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100))
+- cat /var/run/udhcpc.%iface%.pid | xargs -i kill -TERM {} \
++ kill -TERM `cat /var/run/udhcpc.%iface%.pid` \
+ elsif (execable("/sbin/udhcpc"))
+ dhcpcd -k %iface% \
+ elsif (execable("/sbin/dhcpcd")) \ No newline at end of file
diff --git a/ifupdown/ifupdown_0.6.4.oe b/ifupdown/ifupdown_0.6.4.oe
index 2f8eecaf7b..0253e5f151 100644
--- a/ifupdown/ifupdown_0.6.4.oe
+++ b/ifupdown/ifupdown_0.6.4.oe
@@ -5,11 +5,10 @@ configure (or, respectively, deconfigure) network interfaces, based on \
the file /etc/network/interfaces."
SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.orig.tar.gz \
- ${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}-4.6.diff.gz;patch=1 \
+ ${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}-4.8.diff.gz;patch=1 \
file://${FILESDIR}/busybox.patch;patch=1 \
file://${FILESDIR}/udhcpc.patch;patch=1 \
file://${FILESDIR}/zeroconf.patch;patch=1 \
- file://${FILESDIR}/head-tail.patch;patch=1 \
file://${FILESDIR}/gcc34-fix.patch;patch=1"
EXTRA_OEMAKE = ""