From b55d6bf3b7e4463a9b9d5c40ab8f13cd3652f5cb Mon Sep 17 00:00:00 2001
From: "Leo.C.Wu" <xwuxwu@cn.ibm.com>
Date: Fri, 9 Jan 2015 11:19:52 +0800
Subject: [PATCH] fix bug: #4512 nodeset will throw error if osimage pkgdir
 contains multi-value in ubuntu

---
 xCAT-server/lib/xcat/plugins/debian.pm   | 6 ++++++
 xCAT-server/lib/xcat/plugins/genimage.pm | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm
index 13f54eea8..dcaae3baf 100755
--- a/xCAT-server/lib/xcat/plugins/debian.pm
+++ b/xCAT-server/lib/xcat/plugins/debian.pm
@@ -711,6 +711,12 @@ sub mkinstall
         my $initrdpath;
         my $maxmem;
 
+        # only first value is adopted, please see tabdump linuximage, section pkgdir.
+        my @pkgdirs = split(/,/, $pkgdir);
+        if (scalar(@pkgdirs) > 1) {
+            $pkgdir = @pkgdirs[0];
+        }
+
         if (
 	       (
                ($arch =~ /x86/ and
diff --git a/xCAT-server/lib/xcat/plugins/genimage.pm b/xCAT-server/lib/xcat/plugins/genimage.pm
index 5e66879d2..fc54f0619 100644
--- a/xCAT-server/lib/xcat/plugins/genimage.pm
+++ b/xCAT-server/lib/xcat/plugins/genimage.pm
@@ -170,6 +170,13 @@ sub process_request {
        $pkglist = $ref_linuximage_tab->{'pkglist'};
        
        $srcdir = $ref_linuximage_tab->{'pkgdir'};
+       my @pkgarray = split(/,/, $ref_linuximage_tab->{'pkgdir'});
+       if(scalar(@pkgarray) > 1)
+       {
+           $srcdir = @pkgarray[0];
+       }
+       
+
        $srcdir_otherpkgs = $ref_linuximage_tab->{'otherpkgdir'};
        $otherpkglist = $ref_linuximage_tab->{'otherpkglist'};
        $postinstall_filename = $ref_linuximage_tab->{'postinstall'};