From f26a3627a1087816fae1bb671623fc74bf653a90 Mon Sep 17 00:00:00 2001
From: Marek 'marx' Grac <mgrac@redhat.com>
Date: Fri, 28 Jan 2011 15:29:48 +0100
Subject: [PATCH 1/2] resource-agents: Add option disable_rdisc to ip.sh

rdisc is called by ip.sh which causes static routes to be updated by
dynamic ones. This option adds possibility to disable this feature.

Resolves: rhbz#620700
---
 rgmanager/src/resources/ip.sh |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/rgmanager/src/resources/ip.sh b/rgmanager/src/resources/ip.sh
index 4f7e432..38d1ab9 100755
--- a/rgmanager/src/resources/ip.sh
+++ b/rgmanager/src/resources/ip.sh
@@ -121,6 +121,17 @@ meta_data()
 	    <content type="string"/>
 	</parameter>
 
+	<parameter name="disable_rdisc">
+	    <longdesc lang="en">
+	        Disable updating of routing using RDISC protocol and
+	        preserve static routes.
+	    </longdesc>
+	    <shortdesc lang="en">
+	        Disable updating of routing using RDISC protocol
+	    </shortdesc>
+	    <content type="boolean"/>
+	</parameter>
+
     </parameters>
 
     <actions>
@@ -632,7 +643,10 @@ ipv6()
 		# Not sure if this is necessary for ipv6 either.
 		file=$(which rdisc 2>/dev/null)
 		if [ -f "$file" ]; then
-		        killall -HUP rdisc || rdisc -fs
+			if [ "$OCF_RESKEY_disable_rdisc" != "yes" ] && \
+			   [ "$OCF_RESKEY_disable_rdisc" != "1" ]; then
+		        	killall -HUP rdisc || rdisc -fs
+			fi
 		fi
 		
 		return 0
@@ -711,7 +725,10 @@ ipv4()
 		
 		file=$(which rdisc 2>/dev/null)
 		if [ -f "$file" ]; then
-		        killall -HUP rdisc || rdisc -fs
+			if [ "$OCF_RESKEY_disable_rdisc" != "yes" ] && \
+			   [ "$OCF_RESKEY_disable_rdisc" != "1" ]; then
+			        killall -HUP rdisc || rdisc -fs
+			fi
 		fi
 		
 		return 0
-- 
1.7.3.4