osbuild: rename NewGrub2StageOptionsUnified to NewGrub2StageOptions

The non-unified function is gone and we only have one options generator so let's keep the name simple.
osbuild · Jan 16, 2024 · 75781e2 · 75781e2
1 parent 79182e6
commit 75781e2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pkg/manifest/os.go b/pkg/manifest/os.go
@@ -641,7 +641,7 @@ func (p *OS) serialize() osbuild.Pipeline {
 					),
 				)
 			} else {
-				options := osbuild.NewGrub2StageOptionsUnified(pt,
+				options := osbuild.NewGrub2StageOptions(pt,
 					strings.Join(kernelOptions, " "),
 					p.kernelVer,
 					p.platform.GetUEFIVendor() != "",

diff --git a/pkg/manifest/ostree_deployment.go b/pkg/manifest/ostree_deployment.go
@@ -404,7 +404,7 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline {
 		}
 	}
 
-	grubOptions := osbuild.NewGrub2StageOptionsUnified(p.PartitionTable,
+	grubOptions := osbuild.NewGrub2StageOptions(p.PartitionTable,
 		strings.Join(kernelOpts, " "),
 		"",
 		p.platform.GetUEFIVendor() != "",

diff --git a/pkg/osbuild/grub2_stage.go b/pkg/osbuild/grub2_stage.go
@@ -52,7 +52,7 @@ func NewGRUB2Stage(options *GRUB2StageOptions) *Stage {
 	}
 }
 
-func NewGrub2StageOptionsUnified(pt *disk.PartitionTable,
+func NewGrub2StageOptions(pt *disk.PartitionTable,
 	kernelOptions string,
 	kernelVer string,
 	uefi bool,