From 3cac50a3bcd8093b07b205f88399ad51f08a54ad Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 27 Sep 2010 20:21:39 +0000
Subject: [PATCH] -Fix multiwide blade rcons Have ddns delete TXT records for
 DHCP to avoid confusion

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7680 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/ddns.pm | 4 ++++
 xCAT-server/share/xcat/cons/blade    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/xCAT-server/lib/xcat/plugins/ddns.pm b/xCAT-server/lib/xcat/plugins/ddns.pm
index 1c904d013..d64279b52 100644
--- a/xCAT-server/lib/xcat/plugins/ddns.pm
+++ b/xCAT-server/lib/xcat/plugins/ddns.pm
@@ -654,6 +654,10 @@ sub find_nameserver_for_dns {
             push @rrcontent,"$name IN A $_";
         }
     }
+    if ($ctx->{deletemode}) {
+        push @rrcontent,"$name TXT";
+        push @rrcontent,"$name A";
+    }
     if ($zone =~ /IN-ADDR.ARPA/) { #reverse style
         @rrcontent = ("$rname IN PTR $name");
     }
diff --git a/xCAT-server/share/xcat/cons/blade b/xCAT-server/share/xcat/cons/blade
index 65b91a993..92c70fd5f 100755
--- a/xCAT-server/share/xcat/cons/blade
+++ b/xCAT-server/share/xcat/cons/blade
@@ -86,6 +86,7 @@ sub getans {
         $mm = $rsp->{node}->[0]->{mm}->[0];
         $username = $rsp->{node}->[0]->{username}->[0];
         $slot = $rsp->{node}->[0]->{slot}->[0];
+        $slot =~ s/-.*//; #remove range info if multi-wide blade
     }
 }
 my $cmdref={