cmd: bump images to 0.246.0 and wire up --bootc-no-default-kernel-args

cmd/image-builder/main.go

@@ -245,6 +245,10 @@ func cmdManifestWrapper(pbar progress.ProgressBar, cmd *cobra.Command, args []st
 	if err != nil {
 		return nil, err
 	}
+	bootcOmitDefaultKernelArgs, err := cmd.Flags().GetBool("bootc-no-default-kernel-args")
+	if err != nil {
+		return nil, err
+	}
 	// XXX: remove once https://github.com/osbuild/images/pull/1797
 	// and https://github.com/osbuild/bootc-image-builder/pull/1014
 	// are merged
@@ -294,7 +298,7 @@ func cmdManifestWrapper(pbar progress.ProgressBar, cmd *cobra.Command, args []st
 			return nil, err
 		}
 		if bootcBuildRef != "" {
-			buildBootcInfo, err := bootc.ResolveBootcInfo(bootcBuildRef)
+			buildBootcInfo, err := bootc.ResolveBootcBuildInfo(bootcBuildRef)
 			if err != nil {
 				return nil, err
 			}
@@ -338,16 +342,17 @@ func cmdManifestWrapper(pbar progress.ProgressBar, cmd *cobra.Command, args []st
 			DepsolveWarningsOutput: wd,
 			Depsolve:               manifestgenDepsolver,
 		},
-		OutputDir:                outputDir,
-		OutputFilename:           outputFilename,
-		BlueprintPath:            blueprintPath,
-		Ostree:                   ostreeImgOpts,
-		BootcRef:                 bootcRef,
-		BootcInstallerPayloadRef: bootcInstallerPayloadRef,
-		WithSBOM:                 withSBOM,
-		IgnoreWarnings:           ignoreWarnings,
-		Subscription:             subscription,
-		Preview:                  preview,
+		OutputDir:                  outputDir,
+		OutputFilename:             outputFilename,
+		BlueprintPath:              blueprintPath,
+		Ostree:                     ostreeImgOpts,
+		BootcRef:                   bootcRef,
+		BootcInstallerPayloadRef:   bootcInstallerPayloadRef,
+		BootcOmitDefaultKernelArgs: bootcOmitDefaultKernelArgs,
+		WithSBOM:                   withSBOM,
+		IgnoreWarnings:             ignoreWarnings,
+		Subscription:               subscription,
+		Preview:                    preview,
 
 		ForceRepos: forceRepos,
 	}
@@ -607,6 +612,7 @@ operating systems like Fedora, CentOS and RHEL with easy customizations support.
 	manifestCmd.Flags().String("bootc-build-ref", "", `bootc build container ref`)
 	manifestCmd.Flags().String("bootc-installer-payload-ref", "", `bootc installer payload ref`)
 	manifestCmd.Flags().String("bootc-default-fs", "", `default filesystem to use for the bootc install (e.g. ext4)`)
+	manifestCmd.Flags().Bool("bootc-no-default-kernel-args", false, `don't use the default kernel arguments`)
 	manifestCmd.Flags().Bool("use-librepo", true, `use librepo to download packages (disable if you use old versions of osbuild)`)
 	manifestCmd.Flags().Bool("with-sbom", false, `export SPDX SBOM document`)
 	manifestCmd.Flags().Bool("ignore-warnings", false, `ignore warnings during manifest generation`)

cmd/image-builder/manifest.go

@@ -24,17 +24,18 @@ import (
 type manifestOptions struct {
 	ManifestgenOptions manifestgen.Options
 
-	OutputDir                string
-	OutputFilename           string
-	BlueprintPath            string
-	Ostree                   *ostree.ImageOptions
-	BootcRef                 string
-	BootcInstallerPayloadRef string
-	Subscription             *subscription.ImageOptions
-	RpmDownloader            osbuild.RpmDownloader
-	WithSBOM                 bool
-	IgnoreWarnings           bool
-	Preview                  *bool
+	OutputDir                  string
+	OutputFilename             string
+	BlueprintPath              string
+	Ostree                     *ostree.ImageOptions
+	BootcRef                   string
+	BootcInstallerPayloadRef   string
+	BootcOmitDefaultKernelArgs bool
+	Subscription               *subscription.ImageOptions
+	RpmDownloader              osbuild.RpmDownloader
+	WithSBOM                   bool
+	IgnoreWarnings             bool
+	Preview                    *bool
 
 	ForceRepos []string
 }
@@ -97,7 +98,8 @@ func generateManifest(repoDir string, extraRepos []string, img *imagefilter.Resu
 		OSTree:       opts.Ostree,
 		Subscription: opts.Subscription,
 		Bootc: &distro.BootcImageOptions{
-			InstallerPayloadRef: opts.BootcInstallerPayloadRef,
+			InstallerPayloadRef:   opts.BootcInstallerPayloadRef,
+			OmitDefaultKernelArgs: opts.BootcOmitDefaultKernelArgs,
 		},
 		Preview: opts.Preview,
 	}

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/gobwas/glob v0.2.3
 	github.com/mattn/go-isatty v0.0.20
 	github.com/osbuild/blueprint v1.23.0
-	github.com/osbuild/images v0.244.0
+	github.com/osbuild/images v0.246.0
 	github.com/sirupsen/logrus v1.9.4
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10

go.sum

@@ -289,8 +289,8 @@ github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplU
 github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U=
 github.com/osbuild/blueprint v1.23.0 h1:HGMuRKpYg2xBy1QnAQDaIM6xnmzXh4QBrjic86C6Xr8=
 github.com/osbuild/blueprint v1.23.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4=
-github.com/osbuild/images v0.244.0 h1:rtV1kfynZI0MjUFciA339vQsSFWbEjTR+rSYebHU1T4=
-github.com/osbuild/images v0.244.0/go.mod h1:lr0fqJjjOCurTMbgMSDxTwnEalx6CkOVqyB0QmvNqO4=
+github.com/osbuild/images v0.246.0 h1:wR1ViXOp4m/UWwecDTfR+yOfLiW0k8J/jEL7gVcGOsg=
+github.com/osbuild/images v0.246.0/go.mod h1:lr0fqJjjOCurTMbgMSDxTwnEalx6CkOVqyB0QmvNqO4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=