593e13f1ce
virtinst-git-mac-prefix.diff virtman-git-error-reporting.diff virtman-git-explicit-python.diff OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=75
44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
|
|
Subject: virt-install: Error if initrd-inject and not --location
|
|
From: Cole Robinson crobinso@redhat.com Tue Aug 23 15:55:20 2011 -0400
|
|
Date: Tue Aug 23 15:55:20 2011 -0400:
|
|
Git: 178276dbc8978342c842081f67ee7bd06a146282
|
|
|
|
|
|
Index: virtinst-0.600.0/tests/clitest.py
|
|
===================================================================
|
|
--- virtinst-0.600.0.orig/tests/clitest.py
|
|
+++ virtinst-0.600.0/tests/clitest.py
|
|
@@ -267,9 +267,6 @@ args_dict = {
|
|
"--hvm --location %(TREEDIR)s",
|
|
# initrd-inject
|
|
"--hvm --location %(TREEDIR)s --initrd-inject virt-install --extra-args ks=file:/virt-install",
|
|
- # initrd-inject with manual kernel/initrd
|
|
- "--hvm --location %(TREEDIR)s --initrd-inject virt-install --extra-args ks=file:/virt-install",
|
|
- # Directory tree URL install with extra-args
|
|
# Directory tree URL install with extra-args
|
|
"--hvm --location %(TREEDIR)s --extra-args console=ttyS0",
|
|
# Directory tree CDROM install
|
|
@@ -309,6 +306,8 @@ args_dict = {
|
|
"--hvm --pxe --boot menu=foobar",
|
|
# cdrom fail w/ extra-args
|
|
"--hvm --cdrom %(EXISTIMG1)s --extra-args console=ttyS0",
|
|
+ # initrd-inject with manual kernel/initrd
|
|
+ "--hvm --boot kernel=%(TREEDIR)s/pxeboot/vmlinuz,initrd=%(TREEDIR)s/pxeboot/initrd.img --initrd-inject virt-install",
|
|
],
|
|
}, # category "install"
|
|
|
|
Index: virtinst-0.600.0/virt-install
|
|
===================================================================
|
|
--- virtinst-0.600.0.orig/virt-install
|
|
+++ virtinst-0.600.0/virt-install
|
|
@@ -415,6 +415,8 @@ def check_option_collisions(options, gue
|
|
|
|
if not options.location and options.extra:
|
|
fail(_("--extra-args only work if specified with --location."))
|
|
+ if not options.location and options.initrd_injections:
|
|
+ fail(_("--initrd-inject only works if specified with --location."))
|
|
|
|
|
|
##########################
|