From e047771685f7050a1f0896363eceb4ff027f9faa Mon Sep 17 00:00:00 2001
From: ligc <liguangc@cn.ibm.com>
Date: Fri, 9 Jan 2015 15:08:24 +0800
Subject: [PATCH] undo the last checkin

---
 xCAT-server/lib/xcat/plugins/anaconda.pm |  7 +------
 xCAT-server/lib/xcat/plugins/debian.pm   | 21 ++-------------------
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index 26c072fc9..b38dd3cb0 100755
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -2201,12 +2201,7 @@ sub copycd
     {
 
         #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."],
-                   }
-                   );
+        return;
     }
     unless (-r $mntpath . "/.discinfo")
     {
diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm
index 63ad4ee2c..dcaae3baf 100755
--- a/xCAT-server/lib/xcat/plugins/debian.pm
+++ b/xCAT-server/lib/xcat/plugins/debian.pm
@@ -212,19 +212,6 @@ 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!"]});
@@ -266,9 +253,7 @@ sub copycd
 	# So that we have the netboot images
         $isnetinst = 1 if ($line2[7] eq "NETINST");
 
-        if (!$distname) {
-            $distname="debian".$ver;
-        }
+        $distname="debian".$ver;
 	$detdistname="debian".$ver;
     }
     elsif ($prod eq "Ubuntu" or $prod eq "Ubuntu-Server" )
@@ -276,9 +261,7 @@ sub copycd
         # to cover for LTS releases
         $darch = $line2[7] if ($line2[2] eq "LTS");
 
-        if (!$distname) {
-            $distname="ubuntu".$ver;
-        }
+        $distname="ubuntu".$ver;
 	$detdistname="ubuntu".$ver;
         $discno = `cat $path/README.diskdefines | grep 'DISKNUM ' | awk '{print \$3}'`;
     }