From 4b8dcabe27bf63f2df6b2a4f4aa478709847ef98 Mon Sep 17 00:00:00 2001
From: penguhyang <ypbj@cn.ibm.com>
Date: Mon, 9 May 2016 05:19:55 -0400
Subject: [PATCH] fix #1057, there are error messages when upgrading xcat on
 ubuntu

---
 xCAT-server/lib/xcat/plugins/aixinstall.pm |  2 +-
 xCAT-server/lib/xcat/plugins/conserver.pm  |  2 +-
 xCAT-server/lib/xcat/plugins/ddns.pm       | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm
index bc678607b..f84a0d7f1 100644
--- a/xCAT-server/lib/xcat/plugins/aixinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm
@@ -7738,7 +7738,7 @@ sub update_dd_boot
                         }
                         print DDBOOT $l;
                     }
-                    if ($l =~ /rmdev -l \${BASECUST_REMOVAL}/ && !$dontupdt5)
+                    if ($l =~ /rmdev -l \$\{BASECUST_REMOVAL\}/ && !$dontupdt5)
                     {
                         print DDBOOT "            #Remove ODM object definition\n";
                         print DDBOOT "            odmdelete -o CuDv -q name=\${BASECUST_REMOVAL}\n";
diff --git a/xCAT-server/lib/xcat/plugins/conserver.pm b/xCAT-server/lib/xcat/plugins/conserver.pm
index 9d07c9656..4522f2028 100644
--- a/xCAT-server/lib/xcat/plugins/conserver.pm
+++ b/xCAT-server/lib/xcat/plugins/conserver.pm
@@ -191,7 +191,7 @@ sub docfheaders {
   my $idx = 0;
   my $skip = 0;
   my @meat = grep(!/^#/,@$content);
-  unless (grep(/^config \* {/,@meat)) {
+  unless (grep(/^config \* \{/,@meat)) {
     # do not add the ssl configurations 
     # if conserver is not compiled with ssl support
     my $cmd = "console -h 2>&1";
diff --git a/xCAT-server/lib/xcat/plugins/ddns.pm b/xCAT-server/lib/xcat/plugins/ddns.pm
index 0607c54eb..fd061ffb8 100755
--- a/xCAT-server/lib/xcat/plugins/ddns.pm
+++ b/xCAT-server/lib/xcat/plugins/ddns.pm
@@ -1060,35 +1060,35 @@ sub update_namedconf {
                 my $skip=0;
                 do {
                     #push @newnamed,"\t\t//listen-on-v6 { any; };\n";
-                    if ($ctx->{forwarders} and $line =~ /forwarders {/) {
+                    if ($ctx->{forwarders} and $line =~ /forwarders \{/) {
                         push @newnamed,"\tforwarders \{\n";
                         $skip=1;
                         foreach (@{$ctx->{forwarders}}) {
                             push  @newnamed,"\t\t".$_.";\n";
                         }
                         push @newnamed,"\t};\n";
-                    } elsif ($ctx->{slaves} and $line =~ /allow-transfer {/) {
+                    } elsif ($ctx->{slaves} and $line =~ /allow-transfer \{/) {
                         push @newnamed,"\tallow-transfer \{\n";
                         $skip=1;
                         foreach (@{$ctx->{slaves}}) {
                             push  @newnamed,"\t\t".$_.";\n";
                         }
                         push @newnamed,"\t};\n";
-                    } elsif ($ctx->{slaves} and $line =~ /also-notify {/) {
+                    } elsif ($ctx->{slaves} and $line =~ /also-notify \{/) {
                         push @newnamed,"\talso-notify \{\n";
                         $skip=1;
                         foreach (@{$ctx->{slaves}}) {
                             push  @newnamed,"\t\t".$_.";\n";
                         }
                         push @newnamed,"\t};\n";                    
-                    } elsif (defined($ctx->{dnslistenonifs}) and defined($ctx->{dnslistenonifs}->{ipv4}) and $line =~ /listen-on {/) {
+                    } elsif (defined($ctx->{dnslistenonifs}) and defined($ctx->{dnslistenonifs}->{ipv4}) and $line =~ /listen-on \{/) {
                         push @newnamed,"\tlisten-on \{\n";
                         $skip=1;
                         foreach (@{$ctx->{dnslistenonifs}->{ipv4}}) {
                             push  @newnamed,"\t\t".$_.";\n";
                         }
                         push @newnamed,"\t};\n";                    
-                    } elsif (defined($ctx->{dnslistenonifs}) and defined($ctx->{dnslistenonifs}->{ipv6}) and $line =~ /listen-on-v6 {/) {
+                    } elsif (defined($ctx->{dnslistenonifs}) and defined($ctx->{dnslistenonifs}->{ipv6}) and $line =~ /listen-on-v6 \{/) {
                         push @newnamed,"\tlisten-on-v6 \{\n";
                         $skip=1;
                         foreach (@{$ctx->{dnslistenonifs}->{ipv6}}) {