From 8a40af134224cb1411b54a74ebe7bf60c0effc4f Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Mon, 31 Mar 2008 17:13:30 -0700
Subject: add workaround for watchlink to IPaddr2-vyatta

---
 scripts/etc-IPaddr2-vyatta |  2 +-
 scripts/ocf-IPaddr2-vyatta | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'scripts')

diff --git a/scripts/etc-IPaddr2-vyatta b/scripts/etc-IPaddr2-vyatta
index 134d00c..77d89d0 100755
--- a/scripts/etc-IPaddr2-vyatta
+++ b/scripts/etc-IPaddr2-vyatta
@@ -62,7 +62,7 @@ if [ ! -z "$str" ]; then
     esac
 fi
 
-OCF_TYPE=IPaddr2
+OCF_TYPE=IPaddr2-vyatta
 OCF_RESKEY_lvs_support=1
 OCF_RESOURCE_INSTANCE=${OCF_TYPE}_$BASEIP
 export OCF_TYPE OCF_RESOURCE_INSTANCE OCF_RESKEY_lvs_support
diff --git a/scripts/ocf-IPaddr2-vyatta b/scripts/ocf-IPaddr2-vyatta
index 0d1101c..082b84f 100755
--- a/scripts/ocf-IPaddr2-vyatta
+++ b/scripts/ocf-IPaddr2-vyatta
@@ -373,21 +373,7 @@ delete_interface () {
 	if [ $? -ne 0 ]; then
 		return $OCF_ERR_GENERIC
 	fi
-
-	CMD="$IP2UTIL -o -f inet addr show $iface"
-
-	ocf_log info "$CMD"
-	ADDR=`$CMD`
-
-	if [ $? -ne 0 -o ! -z "$ADDR" ]; then
-		return $?
-	fi
-
-	CMD="$IP2UTIL link set $iface down"
-
-	ocf_log info "$CMD"
-	$CMD
-	return $?
+	return 0
 }
 
 #
-- 
cgit v1.2.3