| 1 |
xmw 12/08/01 06:39:07 |
| 2 |
|
| 3 |
Added: aiccu-2007.01.15-setupscript.patch |
| 4 |
aiccu-2007.01.15-r2-init.gentoo.patch |
| 5 |
Log: |
| 6 |
Add after ntpd (bug 390611, thanks Ewoud Kohl van Wijngaarden), fix setupscript functionality (bug 353803, thanks Mateusz Dziadko), assign RDEPEND |
| 7 |
|
| 8 |
(Portage version: 2.1.11.9/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: aiccu-2007.01.15-setupscript.patch |
| 17 |
=================================================================== |
| 18 |
--- aiccu/unix-console/main.c |
| 19 |
+++ aiccu/unix-console/main.c |
| 20 |
@@ -471,6 +471,14 @@ |
| 21 |
*/ |
| 22 |
if (aiccu_setup(hTunnel, true)) |
| 23 |
{ |
| 24 |
+ |
| 25 |
+ /* Running setup script */ |
| 26 |
+ if (g_aiccu->setupscript) |
| 27 |
+ { |
| 28 |
+ aiccu_exec("%s", g_aiccu->setupscript); |
| 29 |
+ } |
| 30 |
+ |
| 31 |
+ |
| 32 |
/* We need to stay running when doing Heartbeat or AYIYA */ |
| 33 |
if ( strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 || |
| 34 |
strcasecmp(hTunnel->sType, "ayiya") == 0) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.1 net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch?rev=1.1&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch?rev=1.1&content-type=text/plain |
| 42 |
|
| 43 |
Index: aiccu-2007.01.15-r2-init.gentoo.patch |
| 44 |
=================================================================== |
| 45 |
--- aiccu/doc/aiccu.init.gentoo |
| 46 |
+++ aiccu/doc/aiccu.init.gentoo |
| 47 |
@@ -2,7 +2,7 @@ |
| 48 |
|
| 49 |
depend() { |
| 50 |
need net |
| 51 |
- after ntp-client |
| 52 |
+ after ntp-client ntpd |
| 53 |
} |
| 54 |
|
| 55 |
checkconfig() { |
| 56 |
@@ -23,14 +23,19 @@ |
| 57 |
start() { |
| 58 |
checkconfig || return 1 |
| 59 |
ebegin "Starting aiccu" |
| 60 |
- start-stop-daemon --start --oknodo --quiet --exec /usr/sbin/aiccu -- start |
| 61 |
+ start-stop-daemon --start --quiet --exec /usr/sbin/aiccu -- start |
| 62 |
eend $? |
| 63 |
} |
| 64 |
|
| 65 |
|
| 66 |
stop() { |
| 67 |
ebegin "Stopping aiccu" |
| 68 |
- start-stop-daemon --stop --oknodo --quiet --exec /usr/sbin/aiccu -- stop |
| 69 |
+ start-stop-daemon --stop --pidfile /var/run/aiccu.pid --quiet --exec /usr/sbin/aiccu -- stop |
| 70 |
eend $? |
| 71 |
} |
| 72 |
|
| 73 |
+restart() { |
| 74 |
+ stop |
| 75 |
+ sleep 3 |
| 76 |
+ start |
| 77 |
+} |
Archives