Attachment 907995 Details for Bug 1108522 – upstart: Make job conf file configurable

[patch] upstart: Make job conf file configurable

tmp.RoDxiEfqe0 (text/plain), 1.21 KB, created by Jan Friesse on 2014-06-12 07:56:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2014-06-12 07:56:42 UTC

Size: 1.21 KB

patch

obsolete

>From d23ee6a3e0d5299f488bf9abed98f1853fd0e8b0 Mon Sep 17 00:00:00 2001
>From: Kazunori INOUE <kazunori.inoue3@gmail.com>
>Date: Thu, 8 May 2014 10:49:24 +0900
>Subject: [PATCH] upstart: Make job conf file configurable
>
>Signed-off-by: Kazunori INOUE <kazunori.inoue3@gmail.com>
>Reviewed-by: Jan Friesse <jfriesse@redhat.com>
>---
> init/corosync.conf.in |    9 +++++++--
> 1 files changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/init/corosync.conf.in b/init/corosync.conf.in
>index a0243f9..e5d7798 100644
>--- a/init/corosync.conf.in
>+++ b/init/corosync.conf.in
>@@ -13,7 +13,7 @@ env deb_lockfile=@LOCALSTATEDIR@/lock/corosync
> script
>     [ -f "$rpm_sysconf" ] && . $rpm_sysconf
>     [ -f "$deb_sysconf" ] && . $deb_sysconf
>-    exec $prog
>+    exec $prog $COROSYNC_OPTIONS
> end script
> 
> pre-start script
>@@ -23,8 +23,13 @@ end script
> post-start script
> wait_for_ipc()
> {
>+    [ -f "$rpm_sysconf" ] && . $rpm_sysconf
>+    [ -f "$deb_sysconf" ] && . $deb_sysconf
>     try=0
>-    while [ "$try" -le "20" ]; do
>+    max_try=$((COROSYNC_INIT_TIMEOUT*2-1))
>+    [ "$max_try" -le "0" ] && max_try=120
>+
>+    while [ "$try" -le "$max_try" ]; do
>         if corosync-cfgtool -s > /dev/null 2>&1; then
>             return 0
>         fi
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 1108522: 907995 | 907996 | 907997 | 907998 | 907999 | 908004 | 908111 | 930505 | 930506 | 930507 | 930509 | 930510 | 930511 | 930512 | 930513 | 930514 | 930515 | 930516 | 930517 | 930518 | 930519 | 930527 | 930528 | 930529 | 930530 | 930531 | 930535 | 930536 | 930537 | 930538 | 930539 | 930540 | 931024