From 27f6761231d44e64226f8dc72a77b4cf55c7a445 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.comq>
Date: Tue, 14 Jan 2014 01:00:33 -0800
Subject: [PATCH] fix defect #3960 Genimage broken for CentOS 5.4 nodes

---
 xCAT-server/share/xcat/netboot/rh/genimage | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index 2d4736e7a..52fd168ff 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -231,8 +231,16 @@ unless ($onlyinitrd) {
       exit 1;
    }
 
+
+   mkpath "$rootimg_dir";
    my $yumconfig;
    open($yumconfig,">","/tmp/genimage.$$.yum.conf");
+
+   #yum/rpm/zypper has defect on calculating diskspace usage when installing rpm on a NFS mounted installroot
+   if(isNFSdir("$rootimg_dir")){
+      print $yumconfig "[main]\ndiskspacecheck=0\n\n";
+   }
+
    my $repnum=0;
    foreach $srcdir (@yumdirs) {
       print $yumconfig "[$osver-$arch-$repnum]\nname=$osver-$arch-$repnum\nbaseurl=file://$srcdir\ngpgpcheck=0\n\n";
@@ -252,10 +260,6 @@ unless ($onlyinitrd) {
    if (!$prompt) { $non_interactive="-y"; }
 
    my $yumcmd = "yum $non_interactive -c /tmp/genimage.$$.yum.conf --installroot=$rootimg_dir/ --disablerepo=* ";
-   #yum/rpm/zypper has defect on calculating diskspace usage when installing rpm on a NFS mounted installroot
-   if(isNFSdir("$rootimg_dir")){
-      $yumcmd .= "--setopt=diskspacecheck=0 ";
-   }  
 
    foreach (0..$repnum) {
       $yumcmd .= "--enablerepo=$osver-$arch-$_ ";