wip

hardys · Jul 16, 2024 · ff049d2 · ff049d2
1 parent 0588601
commit ff049d2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/pkg/build/grub_test.go b/pkg/build/grub_test.go
@@ -27,9 +27,6 @@ func TestGenerateGRUBGuestfishCommands(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, commandString)
 
-	expectedFirstBoot := "sed -i '/ignition.platform/ s/$/ alpha beta /' /tmp/grub.cfg"
-	assert.Contains(t, commandString, expectedFirstBoot)
-
 	expectedDefault := "sed -i '/^GRUB_CMDLINE_LINUX_DEFAULT=\"/ s/\"$/ alpha beta \"/' /tmp/grub"
 	assert.Contains(t, commandString, expectedDefault)
 }

diff --git a/pkg/build/raw_test.go b/pkg/build/raw_test.go
@@ -74,9 +74,7 @@ func TestWriteModifyScript(t *testing.T) {
 			expectedContains: []string{
 				fmt.Sprintf("guestfish --blocksize=$BLOCKSIZE --format=raw --rw -a %s", outputImageFilename),
 				fmt.Sprintf("copy-in %s", builder.context.CombustionDir),
-				"download /boot/grub2/grub.cfg /tmp/grub.cfg",
 				"btrfs filesystem label / INSTALL",
-				"sed -i '/ignition.platform/ s/$/ alpha beta /' /tmp/grub.cfg",
 				"truncate -s 64G",
 				"virt-resize --expand $ROOT_PART",
 			},
@@ -88,8 +86,6 @@ func TestWriteModifyScript(t *testing.T) {
 			renameFilesystem:  false,
 			expectedContains: []string{
 				fmt.Sprintf("guestfish --blocksize=$BLOCKSIZE --format=raw --rw -a %s", outputImageFilename),
-				"download /boot/grub2/grub.cfg /tmp/grub.cfg",
-				"sed -i '/ignition.platform/ s/$/ alpha beta /' /tmp/grub.cfg",
 			},
 			expectedMissing: []string{
 				fmt.Sprintf("copy-in %s", builder.context.CombustionDir),

diff --git a/pkg/build/templates/grub/guestfish-snippet.tpl b/pkg/build/templates/grub/guestfish-snippet.tpl
@@ -1,13 +1,9 @@
-# Configure GRUB for first boot
-# - Without this, the values wouldn't be used until after the first time the
-#   grub configuration is regenerated
-download /boot/grub2/grub.cfg /tmp/grub.cfg
-! sed -i '/ignition.platform/ s/$/ {{.KernelArgs}} /' /tmp/grub.cfg
-upload /tmp/grub.cfg /boot/grub2/grub.cfg
-
 # Configure GRUB defaults
-# - Without this, when `transactional-update grub.cfg` is run it will overwrite
-#   settings used in the above change
+# - So that the update below, and later`transactional-update grub.cfg` will persist the changes
 download /etc/default/grub /tmp/grub
 ! sed -i '/^GRUB_CMDLINE_LINUX_DEFAULT="/ s/"$/ {{.KernelArgs}} "/' /tmp/grub
-upload /tmp/grub /etc/default/grub
+upload /tmp/grub /etc/default/grub
+
+# Configure GRUB for first boot
+# - This re-generates the file applying the /etc/default/grub above
+sh "grub2-mkconfig -o /boot/grub2/grub.cfg"