xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1077 from penguhyang/error_msg_upgrade_ubuntu

Browse Source 
fix #1057, there are error messages when upgrading xcat on ubuntu
This commit is contained in:
yangsong 2016-05-09 22:00:14 -05:00
commit 43305d3fff
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/lib/xcat/plugins/aixinstall.pm
View File

@ -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";

2
xCAT-server/lib/xcat/plugins/conserver.pm
View File

@ -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";

10
xCAT-server/lib/xcat/plugins/ddns.pm
View File

@ -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}}) {