From 0c84550441ea7851acbe5ff78291e24a2abbb010 Mon Sep 17 00:00:00 2001
From: Matt Ezell <matt@mattezell.com>
Date: Tue, 25 Oct 2016 02:21:06 -0400
Subject: [PATCH] Ensure the requested kernel version and associated packages
 are installed (#2018)

If a specific version of the kernel was requested, make sure any other
kernel-related packages requested in a package list get the same version.
Note, packages that get pulled in due to dependencies are NOT checked.
Also avoid updating the kernel packages when the requested version has already
been installed.
---
 xCAT-server/share/xcat/netboot/rh/genimage | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index 5dd7365b4..ea50b4a6c 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -367,20 +367,20 @@ unless ($onlyinitrd) {
             my $pa  = $pkg_hash{$pass}{$_};
             my @npa = ();
 
-            # replace the kernel package with the name has the specific version
+            # replace the kernel package (and headers, tools, etc) with the specific version
             foreach my $p (@$pa) {
-                if ($p =~ /^kernel$/ && $kernelver) {
+                if ($kernelver && $p =~ /^kernel(-headers|-devel|-bootwrapper|-tools)?$/) {
                     my $kernelname;
                     if ($krpmver) {
-                        $kernelname = "kernel-" . $krpmver;
+                        $kernelname = $p . "-" . $krpmver;
                     } else {
-                        $kernelname = "kernel-" . $kernelver;
+                        $kernelname = $p . "-" . $kernelver;
                     }
                     my $searchkern = $yumcmd . " list $kernelname -q";
                     my @kernpkgs   = `$searchkern`;
                     my $found      = 0;
                     foreach my $k (@kernpkgs) {
-                        if ($k =~ /\s*kernel[^\s]*\s+([\w\.-]+)/) {
+                        if ($k =~ /\s*$p\.[^\s]*\s+([\w\.-]+)/) {
                             my $version = $1;
                             if ($kernelver =~ /$version/) {
                                 $found++;
@@ -388,7 +388,7 @@ unless ($onlyinitrd) {
                         }
                     }
                     if ($found eq 0) {
-                        print "Cannot find the kernel with version $kernelver.\n";
+                        print "Cannot find the $p package with version $kernelver.\n";
                         umount_chroot($rootimg_dir);
                         exit 1;
                     }
@@ -546,7 +546,9 @@ unless ($onlyinitrd) {
 
                 # run yum update to update any installed rpms
                 # needed when running genimage again after updating software in repositories
-                my $yumcmd_update = $yumcmd_base . " update  ";
+                # exclude updating the kernel if a specific version was specified
+                my $excludecmd = $kernelver ? " --exclude=kernel\*" : "";
+                my $yumcmd_update = $yumcmd_base . $excludecmd . " update  ";
                 $rc = system("$yumcmd_update");
             }
         }