From 45138801f9dc270831447aaa2e60bbdeb605a2d0 Mon Sep 17 00:00:00 2001
From: Jacob Kozol <jacobdkozol@gmail.com>
Date: Thu, 14 Jan 2021 10:54:18 +0100
Subject: [PATCH] distro/rhel84: fix s390x kernel options

Our s390x images now use the kernel commandline options set in the image
type's declaration.
---
 internal/distro/rhel84/distro.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/distro/rhel84/distro.go b/internal/distro/rhel84/distro.go
index a3d14454c..84b4534e6 100644
--- a/internal/distro/rhel84/distro.go
+++ b/internal/distro/rhel84/distro.go
@@ -257,7 +257,7 @@ func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOp
 
 		p.AddStage(osbuild.NewKernelCmdlineStage(&osbuild.KernelCmdlineStageOptions{
 			RootFsUUID: rootPartition.UUID,
-			KernelOpts: "net.ifnames=0 crashkernel=auto",
+			KernelOpts: t.kernelOptions,
 		}))
 	}