From 6a6144c2d96ad322ce124becde602dbd70dc0c40 Mon Sep 17 00:00:00 2001
From: Lars Karlitski <lars@karlitski.net>
Date: Tue, 29 Oct 2019 12:11:11 +0100
Subject: [PATCH] blueprint: always exclude the rescue kernel

Its BLS entry always expects a separate boot partition. Skip it on all
images until the rescue kernel package is usable.
---
 internal/blueprint/ami_output.go                             | 5 ++++-
 internal/blueprint/openstack_output.go                       | 5 ++++-
 internal/blueprint/vhd_output.go                             | 5 ++++-
 tools/test_image_info/pipelines/ami_empty_blueprint.json     | 3 +++
 .../test_image_info/pipelines/openstack_empty_blueprint.json | 3 +++
 tools/test_image_info/pipelines/vhd_empty_blueprint.json     | 3 +++
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/internal/blueprint/ami_output.go b/internal/blueprint/ami_output.go
index 0a3b4dc72..7335ce5e0 100644
--- a/internal/blueprint/ami_output.go
+++ b/internal/blueprint/ami_output.go
@@ -18,7 +18,10 @@ func (t *amiOutput) translate(b *Blueprint) *pipeline.Pipeline {
 		"checkpolicy",
 		"net-tools",
 	}
-	p := getCustomF30PackageSet(packages[:], []string{})
+	excludedPackages := [...]string{
+		"dracut-config-rescue",
+	}
+	p := getCustomF30PackageSet(packages[:], excludedPackages[:])
 	addF30FixBlsStage(p)
 	addF30LocaleStage(p)
 	addF30FSTabStage(p)
diff --git a/internal/blueprint/openstack_output.go b/internal/blueprint/openstack_output.go
index d93f6a088..a52ccc4d0 100644
--- a/internal/blueprint/openstack_output.go
+++ b/internal/blueprint/openstack_output.go
@@ -18,7 +18,10 @@ func (t *openstackOutput) translate(b *Blueprint) *pipeline.Pipeline {
 		"cloud-init",
 		"libdrm",
 	}
-	p := getCustomF30PackageSet(packages[:], []string{})
+	excludedPackages := [...]string{
+		"dracut-config-rescue",
+	}
+	p := getCustomF30PackageSet(packages[:], excludedPackages[:])
 	addF30LocaleStage(p)
 	addF30FSTabStage(p)
 	addF30GRUB2Stage(p, b.getKernelCustomization())
diff --git a/internal/blueprint/vhd_output.go b/internal/blueprint/vhd_output.go
index db96c972c..55c8516c7 100644
--- a/internal/blueprint/vhd_output.go
+++ b/internal/blueprint/vhd_output.go
@@ -17,7 +17,10 @@ func (t *vhdOutput) translate(b *Blueprint) *pipeline.Pipeline {
 		"WALinuxAgent",
 		"libxcrypt-compat",
 	}
-	p := getCustomF30PackageSet(packages[:], []string{})
+	excludedPackages := [...]string{
+		"dracut-config-rescue",
+	}
+	p := getCustomF30PackageSet(packages[:], excludedPackages[:])
 	addF30LocaleStage(p)
 	addF30FSTabStage(p)
 	addF30GRUB2Stage(p, b.getKernelCustomization())
diff --git a/tools/test_image_info/pipelines/ami_empty_blueprint.json b/tools/test_image_info/pipelines/ami_empty_blueprint.json
index b173fadab..109e99963 100644
--- a/tools/test_image_info/pipelines/ami_empty_blueprint.json
+++ b/tools/test_image_info/pipelines/ami_empty_blueprint.json
@@ -55,6 +55,9 @@
             "checkpolicy",
             "net-tools"
           ],
+          "exclude_packages": [
+            "dracut-config-rescue"
+          ],
           "releasever": "30",
           "basearch": "x86_64"
         }
diff --git a/tools/test_image_info/pipelines/openstack_empty_blueprint.json b/tools/test_image_info/pipelines/openstack_empty_blueprint.json
index 37139e60d..78d45acf7 100644
--- a/tools/test_image_info/pipelines/openstack_empty_blueprint.json
+++ b/tools/test_image_info/pipelines/openstack_empty_blueprint.json
@@ -55,6 +55,9 @@
             "cloud-init",
             "libdrm"
           ],
+          "exclude_packages": [
+            "dracut-config-rescue"
+          ],
           "releasever": "30",
           "basearch": "x86_64"
         }
diff --git a/tools/test_image_info/pipelines/vhd_empty_blueprint.json b/tools/test_image_info/pipelines/vhd_empty_blueprint.json
index aaef4a95d..2706d8fab 100644
--- a/tools/test_image_info/pipelines/vhd_empty_blueprint.json
+++ b/tools/test_image_info/pipelines/vhd_empty_blueprint.json
@@ -54,6 +54,9 @@
             "WALinuxAgent",
             "libxcrypt-compat"
           ],
+          "exclude_packages": [
+            "dracut-config-rescue"
+          ],
           "releasever": "30",
           "basearch": "x86_64"
         }