From 2ab944ea652f29bb786cca7d44b020550205d15b Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Thu, 4 Aug 2016 05:40:01 -0400
Subject: [PATCH] add ubuntu16.04.1 netboot pkglist;modify the precedence of
 SvrUtils::get_file_name

---
 xCAT-server/lib/perl/xCAT/SvrUtils.pm          | 18 +++++++++---------
 .../ubuntu/compute.ubuntu16.04.1.pkglist       | 17 +++++++++++++++++
 2 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.1.pkglist

diff --git a/xCAT-server/lib/perl/xCAT/SvrUtils.pm b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
index 4319eae82..3c813ca45 100755
--- a/xCAT-server/lib/perl/xCAT/SvrUtils.pm
+++ b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
@@ -460,21 +460,21 @@ sub get_file_name {
     if (-r "$searchpath/$profile.$os.$arch.$extension") {
         return "$searchpath/$profile.$os.$arch.$extension";
     }
-    elsif (-r "$searchpath/$profile.$osbase.$arch.$extension") {
-        return "$searchpath/$profile.$osbase.$arch.$extension";
-    }
-    elsif (-r "$searchpath/$profile.$genos.$arch.$extension") {
-        return "$searchpath/$profile.$genos.$arch.$extension";
-    }
     elsif (-r "$searchpath/$profile.$os.$extension") {
         return "$searchpath/$profile.$os.$extension";
     }
+    elsif (($genos) && (-r "$searchpath/$profile.$genos.$arch.$extension")) {
+        return "$searchpath/$profile.$genos.$arch.$extension";
+    }
+    elsif (($genos) && (-r "$searchpath/$profile.$genos.$extension")) {
+        return "$searchpath/$profile.$genos.$extension";
+    }
+    elsif (-r "$searchpath/$profile.$osbase.$arch.$extension") {
+        return "$searchpath/$profile.$osbase.$arch.$extension";
+    }
     elsif (-r "$searchpath/$profile.$osbase.$extension") {
         return "$searchpath/$profile.$osbase.$extension";
     }
-    elsif (-r "$searchpath/$profile.$genos.$extension") {
-        return "$searchpath/$profile.$genos.$extension";
-    }
     elsif (-r "$searchpath/$profile.$arch.$extension") {
         return "$searchpath/$profile.$arch.$extension";
     }
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.1.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.1.pkglist
new file mode 100644
index 000000000..a5861a9e0
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.1.pkglist
@@ -0,0 +1,17 @@
+bash
+nfs-common
+openssl
+isc-dhcp-client
+libc-bin
+linux-image-generic
+openssh-server
+openssh-client
+wget
+ntp
+ntpdate
+rsync
+busybox-static
+gawk
+dnsutils
+tar
+gzip