xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-08 13:55:37 +00:00
Code Issues Releases Wiki Activity

fix for bug 4507: print a warning message if copycds -n specifies a unresonable distribution name

Browse Source
This commit is contained in:
ligc
2015-01-09 14:45:22 +08:00
parent e1cb0c719d
commit 98d8c6ec99
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@ -2201,7 +2201,12 @@ sub copycd
{
#If they say to call it something unidentifiable, give up?
return;
#at least show a warning
$callback->(
{
warning => ["could not identify the distribution name \"$distname\", may cause problems."],
}
);
}
unless (-r $mntpath . "/.discinfo")
{

21
xCAT-server/lib/xcat/plugins/debian.pm
View File

@ -212,6 +212,19 @@ sub copycd
#this plugin needs $path...
return;
}
if ( $distname
and $distname !~ /^debian/i
and $distname !~ /^ubuntu/i)
{
#If they say to call it something unidentifiable, give up?
#at least show a warning
$callback->(
{
warning => ["could not identify the distribution name \"$distname\", may cause problems."],
}
);
}
if ( $copypath || $noosimage || $nonoverwrite ){
$callback->({info=> ["copycd on debian/ubuntu doesn't support -p, -o, -w options!"]});
@ -253,7 +266,9 @@ sub copycd
# So that we have the netboot images
$isnetinst = 1 if ($line2[7] eq "NETINST");
$distname="debian".$ver;
if (!$distname) {
$distname="debian".$ver;
}
$detdistname="debian".$ver;
}
elsif ($prod eq "Ubuntu" or $prod eq "Ubuntu-Server" )
@ -261,7 +276,9 @@ sub copycd
# to cover for LTS releases
$darch = $line2[7] if ($line2[2] eq "LTS");
$distname="ubuntu".$ver;
if (!$distname) {
$distname="ubuntu".$ver;
}
$detdistname="ubuntu".$ver;
$discno = `cat $path/README.diskdefines | grep 'DISKNUM ' | awk '{print \$3}'`;
}