opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-02 02:58:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove references to qcow2

Browse Source 
Issue #16928 rightly points out that qcow2 images are not used on all
podman architectures.

Fixes: #16928

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2022-12-25 10:49:47 -06:00
parent 4a57cfb926
commit 0c68058805
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/machine/init.go
View File

@@ -89,11 +89,11 @@ func init() {
_ = flags.MarkHidden("reexec") _ = flags.MarkHidden("reexec")
UsernameFlagName := "username" UsernameFlagName := "username"
flags.StringVar(&initOpts.Username, UsernameFlagName, cfg.ContainersConfDefaultsRO.Machine.User, "Username used in qcow image") flags.StringVar(&initOpts.Username, UsernameFlagName, cfg.ContainersConfDefaultsRO.Machine.User, "Username used in image")
_ = initCmd.RegisterFlagCompletionFunc(UsernameFlagName, completion.AutocompleteDefault) _ = initCmd.RegisterFlagCompletionFunc(UsernameFlagName, completion.AutocompleteDefault)
ImagePathFlagName := "image-path" ImagePathFlagName := "image-path"
flags.StringVar(&initOpts.ImagePath, ImagePathFlagName, cfg.ContainersConfDefaultsRO.Machine.Image, "Path to qcow image") flags.StringVar(&initOpts.ImagePath, ImagePathFlagName, cfg.ContainersConfDefaultsRO.Machine.Image, "Path to bootable image")
_ = initCmd.RegisterFlagCompletionFunc(ImagePathFlagName, completion.AutocompleteDefault) _ = initCmd.RegisterFlagCompletionFunc(ImagePathFlagName, completion.AutocompleteDefault)
VolumeFlagName := "volume" VolumeFlagName := "volume"

2
pkg/machine/e2e/config_init_test.go
View File

@@ -10,7 +10,7 @@ type initMachine struct {
--disk-size uint Disk size in GB (default 100) --disk-size uint Disk size in GB (default 100)
--ignition-path string Path to ignition file --ignition-path string Path to ignition file
--username string Username of the remote user (default "core" for FCOS, "user" for Fedora) --username string Username of the remote user (default "core" for FCOS, "user" for Fedora)
--image-path string Path to qcow image (default "testing") --image-path string Path to bootable image (default "testing")
-m, --memory uint Memory in MB (default 2048) -m, --memory uint Memory in MB (default 2048)
--now Start machine now --now Start machine now
--rootful Whether this machine should prefer rootful container execution --rootful Whether this machine should prefer rootful container execution