github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-05 19:47:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #564 from nitkon/error_message

Browse Source 
cli: Make message of using initrd OR rootfs clearer
This commit is contained in:
Sebastien Boeuf 2018-08-10 07:36:44 -07:00 committed by GitHub
commit 4220a7a9be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/config.go
View File

@ -322,7 +322,7 @@ func newQemuHypervisorConfig(h hypervisor) (vc.HypervisorConfig, error) {
if image != "" && initrd != "" { if image != "" && initrd != "" {
return vc.HypervisorConfig{}, return vc.HypervisorConfig{},
errors.New("cannot specify an image and an initrd in configuration file") errors.New("having both an image and an initrd defined in the configuration file is not supported")
} }
firmware, err := h.firmware() firmware, err := h.firmware()