From 421a2750f90f41b45322e2dde947b2cd7613ace0 Mon Sep 17 00:00:00 2001
From: qyin <yinqing@cn.ibm.com>
Date: Mon, 19 Jan 2015 15:26:49 +0800
Subject: [PATCH] fix copycds: on debian/ubuntu doesn't support -o option

---
 xCAT-server/lib/xcat/plugins/debian.pm | 28 ++++++++++++++------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm
index 0fc849329..2a9fa17f6 100755
--- a/xCAT-server/lib/xcat/plugins/debian.pm
+++ b/xCAT-server/lib/xcat/plugins/debian.pm
@@ -221,8 +221,8 @@ sub copycd
         return;
     }
 
-    if ( $copypath || $noosimage || $nonoverwrite ){
-        $callback->({info=> ["copycd on debian/ubuntu doesn't support -p, -o, -w options!"]});
+    if ( $copypath || $nonoverwrite ){
+        $callback->({info=> ["copycd on debian/ubuntu doesn't support -p, -w options!"]});
         return;
     }
     
@@ -419,17 +419,19 @@ sub copycd
         }
 
         $callback->({data => "Media copy operation successful"});
-	my @ret=xCAT::SvrUtils->update_tables_with_templates($distname, $arch, $temppath, $osdistroname);
-        if ($ret[0] != 0) {
-	    $callback->({data => "Error when updating the osimage tables: " . $ret[1]});
-	}
-        my @ret=xCAT::SvrUtils->update_tables_with_diskless_image($distname, $arch, undef, "netboot", $temppath, $osdistroname);
-        if ($ret[0] != 0) {
-            $callback->({data => "Error when updating the osimage tables for stateless: " . $ret[1]});
-        }
-        my @ret=xCAT::SvrUtils->update_tables_with_diskless_image($distname, $arch, undef, "statelite", $temppath, $osdistroname);
-        if ($ret[0] != 0) {
-            $callback->({data => "Error when updating the osimage tables for statelite: " . $ret[1]});
+        unless($noosimage) {
+            my @ret=xCAT::SvrUtils->update_tables_with_templates($distname, $arch, $temppath, $osdistroname);
+            if ($ret[0] != 0) {
+                $callback->({data => "Error when updating the osimage tables: " . $ret[1]});
+            }
+            my @ret=xCAT::SvrUtils->update_tables_with_diskless_image($distname, $arch, undef, "netboot", $temppath, $osdistroname);
+            if ($ret[0] != 0) {
+                $callback->({data => "Error when updating the osimage tables for stateless: " . $ret[1]});
+            }
+            my @ret=xCAT::SvrUtils->update_tables_with_diskless_image($distname, $arch, undef, "statelite", $temppath, $osdistroname);
+            if ($ret[0] != 0) {
+                $callback->({data => "Error when updating the osimage tables for statelite: " . $ret[1]});
+            }
         }
     }
 }