From 05339e823e40daeecb219ba278e36533c5e806aa Mon Sep 17 00:00:00 2001
From: billwajda <billwajda@hotmail.com>
Date: Thu, 2 Apr 2015 09:14:10 -0400
Subject: [PATCH] updated dhcp.pm to put out a warning message when
 subnet/netmask for network in network table does not match network configured

---
 xCAT-server/lib/xcat/plugins/dhcp.pm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 8f79aed18..a63e2e6fd 100755
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -2166,21 +2166,21 @@ sub addnet
             while ($idx <= $#dhcpconf)
             {
                 if ($dhcpconf[$idx] =~ /\} # $nic nic_end\n/)
-            {
-                last;
-            }
-            $idx++;
+                {
+                    last;
+                }
+                $idx++;
             }
             unless ($dhcpconf[$idx] =~ /\} # $nic nic_end\n/)
             {
-                  $callback->(
-                      {
-                         error =>
-                            ["Could not add the subnet $net/$mask for nic $nic into $dhcpconffile."],
+                $callback->(
+	            {
+                        error =>
+                            ["Could not add the subnet $net/$mask for nic $nic into $dhcpconffile.\nPlease verify the xCAT database matches networks defined on this system."],
                             errorcode => [1]
-                      }
-                  );
-                return 1;    #TODO: this is an error condition
+                    }
+                );
+                return 1;
             }
         }