feat: ISO VolumeID with ReleaseID siderolabs#8769

xerc · Jul 30, 2024 · a6a5c47 · a6a5c47
1 parent 96492c0
commit a6a5c47
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/pkg/imager/iso/grub.go b/pkg/imager/iso/grub.go
@@ -86,14 +86,14 @@ func CreateGRUB(printf func(string, ...any), options GRUBOptions) error {
 
 	printf("creating ISO image")
 
-	return grubMkrescue(options.OutPath, options.ScratchDir)
+	return grubMkrescue(options)
 }
 
-func grubMkrescue(isoPath, scratchPath string) error {
+func grubMkrescue(options GRUBOptions) error {
 	args := []string{
 		"--compress=xz",
-		"--output=" + isoPath,
-		scratchPath,
+		"--output=" + options.OutPath,
+		options.ScratchDir,
 	}
 
 	if epoch, ok, err := utils.SourceDateEpoch(); err != nil {
@@ -106,6 +106,7 @@ func grubMkrescue(isoPath, scratchPath string) error {
 
 		args = append(args,
 			"--",
+			"-V", fmt.Sprintf("TalosBoot-%s", options.Version),
 			"-volume_date", "all_file_dates", fmt.Sprintf("=%d", epoch),
 			"-volume_date", "uuid", time.Unix(epoch, 0).Format("2006010215040500"),
 		)

diff --git a/pkg/imager/iso/uefi.go b/pkg/imager/iso/uefi.go
@@ -187,15 +187,11 @@ func CreateUEFI(printf func(string, ...any), options UEFIOptions) error {
 
 	if _, err := cmd.Run(
 		"xorriso",
-		"-as",
-		"mkisofs",
-		"-V",
-		"Talos Secure Boot ISO",
-		"-e",
-		"efiboot.img",
+		"-as", "mkisofs",
+		"-V", fmt.Sprintf("TalosBoot-%s", options.Version)
+		"-e", "efiboot.img",
 		"-no-emul-boot",
-		"-o",
-		options.OutPath,
+		"-o", options.OutPath,
 		options.ScratchDir,
 	); err != nil {
 		return err