From c1eeb2f1ed57d696ba7ddd68b5ce6d310339c576 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Mon, 9 Mar 2015 14:51:40 +0800
Subject: [PATCH] Fix bug#4551 - [FVT] Command genimage print out information
 of succeed even if dracut was failed

---
 xCAT-server/share/xcat/netboot/rh/genimage     | 3 ++-
 xCAT-server/share/xcat/netboot/sles/genimage   | 3 ++-
 xCAT-server/share/xcat/netboot/ubuntu/genimage | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index 81ded62ec..56be0a5f5 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -934,7 +934,8 @@ sub mkinitrd_dracut {
     if ($dracutver > "033") {
         $additional_options .= " -N";
     }
-    system("chroot $rootimg_dir dracut $additional_options -f /tmp/initrd.$$.gz $kernelver");
+    !system("chroot $rootimg_dir dracut $additional_options -f /tmp/initrd.$$.gz $kernelver")
+        or die("Error: failed to generate the initial ramdisk for $mode.\n");
     print "the initial ramdisk for $mode is generated successfully.\n";
     move("$rootimg_dir/tmp/initrd.$$.gz", "$destdir/initrd-$mode.gz"); 
 }
diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage
index ae903cc3a..861a6f548 100755
--- a/xCAT-server/share/xcat/netboot/sles/genimage
+++ b/xCAT-server/share/xcat/netboot/sles/genimage
@@ -1072,7 +1072,8 @@ sub mkinitrd_dracut {
         $additional_options .= " -N";
     }
 
-    system("chroot $rootimg_dir dracut $additional_options -f /tmp/initrd.$$.gz $kernelver");
+    !system("chroot $rootimg_dir dracut $additional_options -f /tmp/initrd.$$.gz $kernelver")
+        and die("Error: failed to generate the initial ramdisk for $mode.\n");
     print "the initial ramdisk for $mode is generated successfully.\n";
     move("$rootimg_dir/tmp/initrd.$$.gz", "$destdir/initrd-$mode.gz");
 }
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/genimage b/xCAT-server/share/xcat/netboot/ubuntu/genimage
index 478715df4..7dc708701 100755
--- a/xCAT-server/share/xcat/netboot/ubuntu/genimage
+++ b/xCAT-server/share/xcat/netboot/ubuntu/genimage
@@ -910,7 +910,8 @@ sub mkinitrd_dracut {
         xdie "the mode: $mode is not supported by genimage";
     }
 
-    system("chroot $rootimg_dir dracut -f /tmp/initrd.$$.gz $kernelver");
+    !system("chroot $rootimg_dir dracut -f /tmp/initrd.$$.gz $kernelver")
+        or die("Error: failed to generate the initial ramdisk for $mode.\n");
     print "the initial ramdisk for $mode is generated successfully.\n";
     move("$rootimg_dir/tmp/initrd.$$.gz", "$destdir/initrd-$mode.gz");
 }