| 1 |
floppym 12/06/07 19:53:54 |
| 2 |
|
| 3 |
Modified: iodined.init |
| 4 |
Added: iodine-0.6.0_rc1-ifconfig-path.patch |
| 5 |
Log: |
| 6 |
Look for ifconfig in /bin and /sbin, bug 419151. Use pidfile in init script, bug 348109. Patches by Jason Donenfeld. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 net-misc/iodine/files/iodined.init |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iodine/files/iodined.init?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iodine/files/iodined.init?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iodine/files/iodined.init?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: iodined.init |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/iodine/files/iodined.init,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- iodined.init 26 Sep 2009 19:24:35 -0000 1.1 |
| 24 |
+++ iodined.init 7 Jun 2012 19:53:54 -0000 1.2 |
| 25 |
@@ -1,7 +1,9 @@ |
| 26 |
#!/sbin/runscript |
| 27 |
-# Copyright 1999-2007 Gentoo Foundation |
| 28 |
+# Copyright 1999-2012 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/files/iodined.init,v 1.1 2009/09/26 19:24:35 vostorga Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iodine/files/iodined.init,v 1.2 2012/06/07 19:53:54 floppym Exp $ |
| 32 |
+ |
| 33 |
+PID_FILE="/var/run/iodined.pid" |
| 34 |
|
| 35 |
depend() { |
| 36 |
need net |
| 37 |
@@ -49,12 +51,12 @@ |
| 38 |
eerror "Please set a domain (IODINED_DOMAIN) in /etc/conf.d/iodined!" |
| 39 |
return 1 |
| 40 |
fi |
| 41 |
- start-stop-daemon --start --exec /usr/bin/iodined -- $ARGS |
| 42 |
+ start-stop-daemon --start --exec /usr/bin/iodined --pidfile $PID_FILE -- -F $PID_FILE $ARGS |
| 43 |
eend $? |
| 44 |
} |
| 45 |
|
| 46 |
stop() { |
| 47 |
ebegin "Stopping iodined" |
| 48 |
- start-stop-daemon --stop --exec /usr/bin/iodined |
| 49 |
+ start-stop-daemon --stop --exec /usr/bin/iodined --pidfile $PID_FILE |
| 50 |
eend $? |
| 51 |
} |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.1 net-misc/iodine/files/iodine-0.6.0_rc1-ifconfig-path.patch |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iodine/files/iodine-0.6.0_rc1-ifconfig-path.patch?rev=1.1&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/iodine/files/iodine-0.6.0_rc1-ifconfig-path.patch?rev=1.1&content-type=text/plain |
| 59 |
|
| 60 |
Index: iodine-0.6.0_rc1-ifconfig-path.patch |
| 61 |
=================================================================== |
| 62 |
diff -ur iodine-0.6.0-rc1-original/src/tun.c iodine-0.6.0-rc1/src/tun.c |
| 63 |
--- iodine-0.6.0-rc1-original/src/tun.c 2012-06-01 22:04:35.870962402 +0200 |
| 64 |
+++ iodine-0.6.0-rc1/src/tun.c 2012-06-02 04:32:08.967846671 +0200 |
| 65 |
@@ -455,7 +455,7 @@ |
| 66 |
} |
| 67 |
#ifndef WINDOWS32 |
| 68 |
snprintf(cmdline, sizeof(cmdline), |
| 69 |
- "/sbin/ifconfig %s %s %s netmask %s", |
| 70 |
+ "PATH=/bin:/sbin ifconfig %s %s %s netmask %s", |
| 71 |
if_name, |
| 72 |
ip, |
| 73 |
#ifdef FREEBSD |
| 74 |
@@ -522,7 +522,7 @@ |
| 75 |
|
| 76 |
if (mtu > 200 && mtu <= 1500) { |
| 77 |
snprintf(cmdline, sizeof(cmdline), |
| 78 |
- "/sbin/ifconfig %s mtu %u", |
| 79 |
+ "PATH=/bin:/sbin ifconfig %s mtu %u", |
| 80 |
if_name, |
| 81 |
mtu); |
Archives