From bb78a4f0e1324e49958064315bdaef1ba62fb4af Mon Sep 17 00:00:00 2001 From: zhanx Date: Thu, 27 Aug 2009 08:15:01 +0000 Subject: [PATCH] fix bug 2845224, makedhcp -n does not create /etc/dhcpsd.cnf file git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4046 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/dhcp.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm index 7385e72d5..a9085f4ac 100644 --- a/xCAT-server/lib/xcat/plugins/dhcp.pm +++ b/xCAT-server/lib/xcat/plugins/dhcp.pm @@ -378,8 +378,8 @@ sub addnode_aix push @node_section, " {\n"; push @node_section, " option 1 $netmask_linux\n"; push @node_section, " option 12 $hname\n"; - push @node_section, " option sa $tftpserver\n"; - push @node_section, " option bf \"/tftpboot/$hname\"\n"; +# push @node_section, " option sa $tftpserver\n"; +# push @node_section, " option bf \"/tftpboot/$hname\"\n"; push @node_section, " } # node $hname end\n"; @@ -1125,11 +1125,13 @@ sub gen_aix_net # push @netent, " option 66 $tftp\n"; # } if ($logservers) { + $logservers =~ s/,/ /g; push @netent, " option 7 $logservers\n"; } elsif ($myip){ push @netent, " option 7 $myip\n"; } if ($ntpservers) { + $ntpservers =~ s/,/ /g; push @netent, " option 42 $ntpservers\n"; } elsif ($myip){ push @netent, " option 42 $myip\n"; @@ -1137,6 +1139,7 @@ sub gen_aix_net push @netent, " option 15 \"$domain\"\n"; if ($nameservers) { + $nameservers =~ s/,/ /g; push @netent, " option 6 $nameservers\n"; } push @netent, " subnet $net\n {\n";