From e959e5a698b847a01669326b61baaedfeadbeea5 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Thu, 9 Apr 2015 07:23:03 -0400
Subject: [PATCH] GPU supporting: remove linux-image and linux-headers from
 diskfull pkglist, modify hackuname to not overwrite uname-binary

---
 .../ubuntu/cudafull.ubuntu14.04.2.ppc64el.pkglist     |  2 --
 .../ubuntu/cudaruntime.ubuntu14.04.2.ppc64el.pkglist  |  2 --
 xCAT-server/share/xcat/netboot/ubuntu/genimage        | 11 +++++------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/xCAT-server/share/xcat/install/ubuntu/cudafull.ubuntu14.04.2.ppc64el.pkglist b/xCAT-server/share/xcat/install/ubuntu/cudafull.ubuntu14.04.2.ppc64el.pkglist
index ceccfca02..1f38963fb 100644
--- a/xCAT-server/share/xcat/install/ubuntu/cudafull.ubuntu14.04.2.ppc64el.pkglist
+++ b/xCAT-server/share/xcat/install/ubuntu/cudafull.ubuntu14.04.2.ppc64el.pkglist
@@ -3,8 +3,6 @@ nfs-common
 openssl
 isc-dhcp-client
 libc-bin
-linux-image-generic-lts-utopic
-linux-headers-generic-lts-utopic
 openssh-server
 openssh-client
 wget
diff --git a/xCAT-server/share/xcat/install/ubuntu/cudaruntime.ubuntu14.04.2.ppc64el.pkglist b/xCAT-server/share/xcat/install/ubuntu/cudaruntime.ubuntu14.04.2.ppc64el.pkglist
index 22e55929a..492c2409d 100644
--- a/xCAT-server/share/xcat/install/ubuntu/cudaruntime.ubuntu14.04.2.ppc64el.pkglist
+++ b/xCAT-server/share/xcat/install/ubuntu/cudaruntime.ubuntu14.04.2.ppc64el.pkglist
@@ -3,8 +3,6 @@ nfs-common
 openssl
 isc-dhcp-client
 libc-bin
-linux-image-generic-lts-utopic
-linux-headers-generic-lts-utopic
 openssh-server
 openssh-client
 wget
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/genimage b/xCAT-server/share/xcat/netboot/ubuntu/genimage
index a5a67ed8f..ee80ba6ed 100755
--- a/xCAT-server/share/xcat/netboot/ubuntu/genimage
+++ b/xCAT-server/share/xcat/netboot/ubuntu/genimage
@@ -1913,13 +1913,12 @@ sub load_dd ()
 
 #To hack the uname
 sub use_hackuname {
-    if ( -e "$rootimg_dir/bin/uname-binary") {
-        system("rm $rootimg_dir/bin/uname-binary");
+    unless ( -e "$rootimg_dir/bin/uname-binary") {
+        if ( -e -x "$rootimg_dir/bin/uname" ) {
+            move("$rootimg_dir/bin/uname", "$rootimg_dir/bin/uname-binary");
+        }
     }
-    if ( -e -x "$rootimg_dir/bin/uname" ) {
-        move("$rootimg_dir/bin/uname", "$rootimg_dir/bin/uname-binary");  
-    }
-   
+
     # write the hacked uname script
     my $unamefile;
     open($unamefile, ">", "$rootimg_dir/bin/uname");