From 967dd0f5fba362ddf2624bcda8ba10e4eec63661 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 9 Nov 2016 11:24:58 -0500
Subject: [PATCH] Fix Debian and SLES rootimg.gz compatibility

Do not require repacking of a rootimage if the
environment has the 'old style' packed image.
---
 xCAT-server/lib/xcat/plugins/debian.pm | 3 ++-
 xCAT-server/lib/xcat/plugins/sles.pm   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm
index 412e8a87f..6f9802468 100644
--- a/xCAT-server/lib/xcat/plugins/debian.pm
+++ b/xCAT-server/lib/xcat/plugins/debian.pm
@@ -1171,6 +1171,7 @@ sub mknetboot
 
         $platform = xCAT_plugin::debian::getplatform($osver);
         my $suffix = 'cpio.gz';
+        $suffix = 'gz' if (-r "$rootimgdir/rootimg.gz");
         $suffix = 'cpio.xz' if (-r "$rootimgdir/rootimg.cpio.xz");
         $suffix = 'tar.gz' if (-r "$rootimgdir/rootimg.tar.gz");
         $suffix = 'tar.xz' if (-r "$rootimgdir/rootimg.tar.xz");
@@ -1223,7 +1224,7 @@ sub mknetboot
                     copy("$rootimgdir/initrd.gz", "$rootimgdir/initrd-stateless.gz");
                 }
             }
-            unless (-r "$rootimgdir/rootimg.cpio.gz" or -r "$rootimgdir/rootimg.cpio.xz" or -r "$rootimgdir/rootimg.tar.gz" or -r "$rootimgdir/rootimg.tar.xz" or -r "$rootimgdir/rootimg.sfs") {
+            unless (-r "$rootimgdir/rootimg.cpio.gz" or -r "$rootimgdir/rootimg.cpio.xz" or -r "$rootimgdir/rootimg.tar.gz" or -r "$rootimgdir/rootimg.tar.xz" or -r "$rootimgdir/rootimg.sfs" or -r "$rootimgdir/rootimg.gz") {
                 $callback->({
                         error => ["No packed image for platform $osver, architecture $arch, and profile $profile, please run packimage (e.g.  packimage -o $osver -p $profile -a $arch"],
                         errorcode => [1] });
diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index 2de029f12..ea3518bb6 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -329,6 +329,7 @@ sub mknetboot
 
         my $suffix = 'cpio.gz';
         $suffix = 'sfs' if (-r "$rootimgdir/rootimg.sfs");
+        $suffix = 'gz' if (-r "$rootimgdir/rootimg.gz");
         $suffix = 'cpio.xz' if (-r "$rootimgdir/rootimg.cpio.xz");
         $suffix = 'tar.gz' if (-r "$rootimgdir/rootimg.tar.gz");
         $suffix = 'tar.xz' if (-r "$rootimgdir/rootimg.tar.xz");
@@ -383,7 +384,7 @@ sub mknetboot
                 }
             }
 
-            unless (-r "$rootimgdir/rootimg.cpio.gz" or -r "$rootimgdir/rootimg.cpio.xz" or -r "$rootimgdir/rootimg.tar.gz" or -r "$rootimgdir/rootimg.tar.xz" or -r "$rootimgdir/rootimg.sfs") {
+            unless (-r "$rootimgdir/rootimg.cpio.gz" or -r "$rootimgdir/rootimg.cpio.xz" or -r "$rootimgdir/rootimg.tar.gz" or -r "$rootimgdir/rootimg.tar.xz" or -r "$rootimgdir/rootimg.sfs" or -r "$rootimgdir/rootimg.gz") {
                 $callback->({
                         error => [qq{No packed image for platform $osver, architecture $arch, and profile $profile, please run packimage before nodeset}],
                         errorcode => [1]