From 4607e8138f7b01c90b06e93e2b0f0ab5a40979a6 Mon Sep 17 00:00:00 2001
From: huweihua <huweihua@cn.ibm.com>
Date: Thu, 13 Nov 2014 02:53:34 -0500
Subject: [PATCH 1/4] fix defect4388: forbid firmware update during Mellanox
 drives installation

---
 xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
index 1bf577624..62039922e 100755
--- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
+++ b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
@@ -144,7 +144,7 @@ deb http://91.189.88.140/ubuntu-ports/ trusty-updates universe" >> /etc/apt/sour
             uname -m |grep ppc64 >/dev/null
         then
             echo "ARCH=powerpc perl -x mlnxofedinstall $mlnxofed_options"
-            ARCH=powerpc perl -x mlnxofedinstall $mlnxofed_options
+            ARCH=powerpc perl -x mlnxofedinstall --without-fw-update  $mlnxofed_options
             sleep 1
             service openibd restart
         else

From ac83f5c65f6ab2bb6a95efc1976fbcfc932f1bea Mon Sep 17 00:00:00 2001
From: huweihua <huweihua@cn.ibm.com>
Date: Thu, 13 Nov 2014 03:03:31 -0500
Subject: [PATCH 2/4] fix defect4389:omit the output of ifup command

---
 xCAT/postscripts/configib | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT/postscripts/configib b/xCAT/postscripts/configib
index 2845695ae..3637cfb25 100755
--- a/xCAT/postscripts/configib
+++ b/xCAT/postscripts/configib
@@ -604,10 +604,10 @@ then
                 do 
                     ifdown $tmp  > /dev/null 2>&1
                     sleep 2
-                    ifup   $tmp
+                    ifup   $tmp > /dev/null 2>&1
                 done
             else 
-                ifup $nic     
+                ifup $nic    > /dev/null 2>&1 
             fi
         fi
     done

From e638a90375d266cd0bf8723cb0122ac7413480c5 Mon Sep 17 00:00:00 2001
From: zhaoertao <ertaozh@cn.ibm.com>
Date: Thu, 13 Nov 2014 03:25:54 -0500
Subject: [PATCH 3/4] fix bug 4392:xCAT upgrade failed because of
 xcat-genesis-scripts-amd64 and xcat-genesis-scripts

---
 xCAT-genesis-scripts/debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xCAT-genesis-scripts/debian/control b/xCAT-genesis-scripts/debian/control
index 5ae63c3fb..a8e44e30b 100644
--- a/xCAT-genesis-scripts/debian/control
+++ b/xCAT-genesis-scripts/debian/control
@@ -8,6 +8,7 @@ Standards-Version: 3.9.2
 Package: xcat-genesis-scripts
 Architecture: amd64 ppc64el
 Depends: xcat-genesis-base-amd64[any-amd64],xcat-genesis-base-ppc64[any-ppc64el]
+Replaces: xcat-genesis-scripts-amd64[any-amd64]
 Description: xCAT genesis 
 	(Genesis Enhanced Netboot Environment for System Information and Servicing) is a small, embedded-like environment for xCAT's use in discovery and management actions when interaction with an OS is infeasible. This package reperesents the EPL content that is more tightly bound to specific xcat-core versions
 

From 65814f3b59a476874922889148084db2d9d72ebc Mon Sep 17 00:00:00 2001
From: zhaoertao <ertaozh@cn.ibm.com>
Date: Thu, 13 Nov 2014 21:54:17 -0500
Subject: [PATCH 4/4] fix bug 4395: ubuntu didn't get pkgdir from the osimage
 pkdir attribute

---
 xCAT-server/lib/perl/xCAT/Template.pm              | 3 +++
 xCAT-server/lib/xcat/plugins/debian.pm             | 2 +-
 xCAT-server/share/xcat/install/ubuntu/compute.tmpl | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index 6852a0e27..fe202fe3a 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -231,6 +231,9 @@ sub subvars {
     
           $inc =~ s/#INSTALL_SOURCES#/$source/g;
           $inc =~ s/#INSTALL_SOURCES_IN_PRE#/$source_in_pre/g;
+          if (("ubuntu" eq $platform) || ("debian" eq $platform)) {
+              $inc =~ s/#INCLUDE_OSIMAGE_PKGDIR#/$pkgdirs[-1]/;
+          }
       }
     
       #ok, now do everything else..
diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm
index 5d9d59a90..27d0318b6 100755
--- a/xCAT-server/lib/xcat/plugins/debian.pm
+++ b/xCAT-server/lib/xcat/plugins/debian.pm
@@ -661,7 +661,7 @@ sub mkinstall
                 "$installroot/autoinst/" . $node,
                 $node,
 	    		$pkglistfile,
-		    	"",
+		        $pkgdir,
 			    $platform
                 );
         }
diff --git a/xCAT-server/share/xcat/install/ubuntu/compute.tmpl b/xCAT-server/share/xcat/install/ubuntu/compute.tmpl
index 16acab413..d3b3a79c8 100644
--- a/xCAT-server/share/xcat/install/ubuntu/compute.tmpl
+++ b/xCAT-server/share/xcat/install/ubuntu/compute.tmpl
@@ -18,7 +18,7 @@ d-i netcfg/dhcp_timeout string 120
 
 d-i mirror/country string manual
 d-i mirror/protocol string http
-d-i mirror/http/directory string /install/#TABLE:nodetype:$NODE:os#/#TABLE:nodetype:$NODE:arch#
+d-i mirror/http/directory string #INCLUDE_OSIMAGE_PKGDIR#
 d-i mirror/http/proxy string
 
 # Suite to install.