From 9cdf3c20e39a5fc36ae8ac7ffbd98aa3f8413fc9 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 1 Jul 2008 14:11:01 +0000
Subject: [PATCH] -Fix genimage script for rh/centos/fedora to only check
 kernel versions after they might have been actually installed before assume
 it matches the genimage system

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1815 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/share/xcat/netboot/rh/genimage | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index 918035744..07c40be7d 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -50,22 +50,6 @@ GetOptions(
    't=s' => \$tmplimit,
    'k=s' => \$kernelver
 );
-#Default to the first kernel found in the install image if nothing specified explicitly.
-#A more accurate guess than whatever the image build server happens to be running
-#If specified, that takes precedence.
-#if image has one, that is used
-#if all else fails, resort to uname -r like this script did before
-my @KVERS= <$installroot/netboot/$osver/$arch/$profile/rootimg/lib/modules/*>;
-if (scalar(@KVERS)) {
-    $basekernelver = basename($KVERS[0]);
-}
-unless ($basekernelver) {
-    $basekernelver = `uname -r`;
-}
-unless ($kernelver) {
-    $kernelver=$basekernelver;
-}
-chomp($kernelver);
 unless ($osver and $profile and $netdriver and $prinic) {
    print 'Usage: genimage -i <nodebootif> -n <nodenetdrivers> [-r <otherifaces>] -o <OSVER> -p <PROFILE> -k <KERNELVER>'."\n";
    print "Examples:\n";
@@ -139,6 +123,22 @@ unless ($onlyinitrd) {
    }
    postscripts(); #run 'postscripts'
 }
+#Default to the first kernel found in the install image if nothing specified explicitly.
+#A more accurate guess than whatever the image build server happens to be running
+#If specified, that takes precedence.
+#if image has one, that is used
+#if all else fails, resort to uname -r like this script did before
+my @KVERS= <$installroot/netboot/$osver/$arch/$profile/rootimg/lib/modules/*>;
+if (scalar(@KVERS)) {
+    $basekernelver = basename($KVERS[0]);
+}
+unless ($basekernelver) {
+    $basekernelver = `uname -r`;
+}
+unless ($kernelver) {
+    $kernelver=$basekernelver;
+}
+chomp($kernelver);
 unlink "/tmp/genimage.$$.yum.conf";
 mkinitrd();