correct the dns configuration during node provision when unicast dhcp is enabled

xCAT-server/lib/xcat/plugins/sles.pm

@@ -1182,11 +1182,19 @@ sub mkinstall
                 }
 
                if(scalar @nameserversIP){
-                  $kcmdline .=" dns=".join(",",@nameserversIP);
+                  $kcmdline .=" Nameserver=".join(",",@nameserversIP);
                }
+
+               my $nd = xCAT::NetworkUtils->getNodeDomains([$node]);
+               my %nodedomains = %$nd;
+               my $domain=$nodedomains{$node};
+
+               $kcmdline .=" Domain=$domain ";
            }            
 
+           
 
+ 
 
             if (defined $sent->{serialport})
             {

xCAT-server/share/xcat/install/scripts/post.rh.common

@@ -1,16 +1,8 @@
 #
-# Setup hostname and resov.conf
+# Setup hostname
 #
 echo "post scripts" >/root/post.log
 
-#there is no network option to set dns search domain in kickstart file, 
-#the search domain in /etc/resolv.conf is set in the post installation script
-export MANAGEDADDRESSMODE=#MANAGEDADDRESSMODE#
-export SEARCHDOMAIN=#GETNODEDOMAIN:THISNODE#
-
-if [ "$MANAGEDADDRESSMODE" == "static" ]; then
- echo "search $SEARCHDOMAIN" >> /etc/resolv.conf
-fi
 
 export PRINIC=#TABLEBLANKOKAY:noderes:THISNODE:primarynic#
 if [ "$PRINIC" == "mac" ]

xCAT-server/share/xcat/install/scripts/pre.rh

@@ -14,6 +14,17 @@ if [ -r /tmp/updates/etc/pki/tls/certs/ca-bundle.crt ]; then
 fi
 
 
+#there is no boot option to set dns search domain in kickstart file,
+#the search domain in /etc/resolv.conf is set in the pre installation script
+export MANAGEDADDRESSMODE=#MANAGEDADDRESSMODE#
+export SEARCHDOMAIN=#GETNODEDOMAIN:THISNODE#
+
+if [ "$MANAGEDADDRESSMODE" == "static" ]; then
+ echo "#appended by %pre " >> /etc/resolv.conf
+ echo "search $SEARCHDOMAIN" >> /etc/resolv.conf
+fi
+
+
 
 cat >/tmp/baz.py <<EOF
 #!/usr/bin/python