diff mbox

[4/5] KVM test: Make OpenSUSE and SLES to use unattended_cdrom

Message ID 1303166445-17898-5-git-send-email-lmr@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lucas Meneghel Rodrigues April 18, 2011, 10:40 p.m. UTC 
We had disabled unattended_cdrom usage with SLES and
OpenSUSE due to the fact that autoyast=cdrom wasn't
working properly to specify a profile.

However, the interaction of the linux floppy driver with
qemu-kvm and qemu tends to generate some pretty bad guest
kernel panics, reason why we came up with unattended_cdrom
for Fedora and RHEL in the first place. Thinkering a bit
more with autoyast documentation, I've discovered that
specifying autoyast=device://scd0/autoinst.xml works fine
and so I've changed the default for both distros to use
the CD again. Now, people will have a much smoother experience
installing those distros under KVM autotest.

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
 client/tests/kvm/tests_base.cfg.sample |   56 ++++++++++++++++----------------
 1 files changed, 28 insertions(+), 28 deletions(-)
diff mbox

Patch

diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index fbe416e..5bee383 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -1294,8 +1294,8 @@  variants:
                 unattended_install:
                     # You have to use autoyast=floppy if you want to use floppies to
                     # hold your autoyast file
-                    extra_params += " --append 'autoyast=floppy console=ttyS0,115200 console=tty0'"
-                    #extra_params += " --append 'autoyast=cdrom console=ttyS0,115200 console=tty0'"
+                    #extra_params += " --append 'autoyast=floppy console=ttyS0,115200 console=tty0'"
+                    extra_params += " --append 'autoyast=device://scd0/autoinst.xml console=ttyS0,115200 console=tty0'"
                     wait_no_ack = yes
 
                 variants:
@@ -1308,8 +1308,8 @@  variants:
                             md5sum_1m_cd1 = c720b30557af758e69de450409516369
                         unattended_install:
                             unattended_file = unattended/OpenSUSE-11.xml
-                            floppy = images/opensuse-11-0-32/autoyast.vfd
-                            #cdrom_unattended = images/opensuse-11-0-32/autoyast.iso
+                            #floppy = images/opensuse-11-0-32/autoyast.vfd
+                            cdrom_unattended = images/opensuse-11-0-32/autoyast.iso
                             kernel = images/opensuse-11-0-32/linux
                             initrd = images/opensuse-11-0-32/initrd
                             boot_path = boot/i386/loader
@@ -1323,8 +1323,8 @@  variants:
                         image_name = openSUSE-11.0-64
                         unattended_install:
                             unattended_file = unattended/OpenSUSE-11.xml
-                            floppy = images/opensuse-11-0-64/autoyast.vfd
-                            #cdrom_unattended = images/opensuse-11-0-64/autoyast.iso
+                            #floppy = images/opensuse-11-0-64/autoyast.vfd
+                            cdrom_unattended = images/opensuse-11-0-64/autoyast.iso
                             kernel = images/opensuse-11-0-64/linux
                             initrd = images/opensuse-11-0-64/initrd
                             boot_path = boot/x86_64/loader
@@ -1342,8 +1342,8 @@  variants:
                             md5sum_1m_cd1 = b70217417468389083429f81ba7ce2bd
                         unattended_install:
                             unattended_file = unattended/OpenSUSE-11.xml
-                            floppy = images/opensuse-11-1-32/autoyast.vfd
-                            #cdrom_unattended = images/opensuse-11-1-32/autoyast.iso
+                            #floppy = images/opensuse-11-1-32/autoyast.vfd
+                            cdrom_unattended = images/opensuse-11-1-32/autoyast.iso
                             kernel = images/opensuse-11-1-32/linux
                             initrd = images/opensuse-11-1-32/initrd
                             boot_path = boot/i386/loader
@@ -1361,8 +1361,8 @@  variants:
                             md5sum_1m_cd1 = 768ca32503ef92c28f2d144f2a87e4d0
                         unattended_install:
                             unattended_file = unattended/OpenSUSE-11.xml
-                            floppy = images/opensuse-11-1-64/autoyast.vfd
-                            #cdrom_unattended = images/opensuse-11-1-64/autoyast.iso
+                            #floppy = images/opensuse-11-1-64/autoyast.vfd
+                            cdrom_unattended = images/opensuse-11-1-64/autoyast.iso
                             kernel = images/opensuse-11-1-64/linux
                             initrd = images/opensuse-11-1-64/initrd
                             boot_path = boot/x86_64/loader
@@ -1376,8 +1376,8 @@  variants:
                         image_name = openSUSE-11.2-32
                         unattended_install:
                             unattended_file = unattended/OpenSUSE-11.xml
-                            floppy = images/opensuse-11-2-32/autoyast.vfd
-                            #cdrom_unattended = images/opensuse-11-2-32/autoyast.iso
+                            #floppy = images/opensuse-11-2-32/autoyast.vfd
+                            cdrom_unattended = images/opensuse-11-2-32/autoyast.iso
                             kernel = images/opensuse-11-2-32/linux
                             initrd = images/opensuse-11-2-32/initrd
                             boot_path = boot/i386/loader
@@ -1391,8 +1391,8 @@  variants:
                         image_name = openSUSE-11.2-64
                         unattended_install:
                             unattended_file = unattended/OpenSUSE-11.xml
-                            floppy = images/opensuse11-2-64/autoyast.vfd
-                            #cdrom_unattended = images/opensuse11-2-64/autoyast.iso
+                            #floppy = images/opensuse11-2-64/autoyast.vfd
+                            cdrom_unattended = images/opensuse11-2-64/autoyast.iso
                             kernel = images/opensuse-11-2-64/linux
                             initrd = images/opensuse-11-2-64/initrd
                             boot_path = boot/x86_64/loader
@@ -1405,8 +1405,8 @@  variants:
                         image_name = openSUSE-11.3-32
                         unattended_install:
                             unattended_file = unattended/OpenSUSE-11.xml
-                            floppy = images/opensuse-11-3-32/autoyast.vfd
-                            #cdrom_unattended = images/opensuse-11-3-32/autoyast.iso
+                            #floppy = images/opensuse-11-3-32/autoyast.vfd
+                            cdrom_unattended = images/opensuse-11-3-32/autoyast.iso
                             kernel = images/opensuse-11-3-32/linux
                             initrd = images/opensuse-11-3-32/initrd
                             boot_path = boot/i386/loader
@@ -1419,8 +1419,8 @@  variants:
                         image_name = openSUSE-11.3-64
                         unattended_install:
                             unattended_file = unattended/OpenSUSE-11.xml
-                            floppy = images/opensuse-11-3-64/autoyast.vfd
-                            #cdrom_unattended = images/opensuse-11-3-64/autoyast.iso
+                            #floppy = images/opensuse-11-3-64/autoyast.vfd
+                            cdrom_unattended = images/opensuse-11-3-64/autoyast.iso
                             kernel = images/opensuse-11-3-64/linux
                             initrd = images/opensuse-11-3-64/initrd
                             boot_path = boot/x86_64/loader
@@ -1434,8 +1434,8 @@  variants:
                 unattended_install:
                     # You have to use autoyast=floppy if you want to use floppies to
                     # hold your autoyast file
-                    extra_params += " --append 'autoyast=floppy console=ttyS0,115200 console=tty0'"
-                    #extra_params += " --append 'autoyast=cdrom console=ttyS0,115200 console=tty0'"
+                    #extra_params += " --append 'autoyast=floppy console=ttyS0,115200 console=tty0'"
+                    extra_params += " --append 'autoyast=device://scd0/autoinst.xml console=ttyS0,115200 console=tty0'"
                     kernel = linux
                     initrd = initrd
                     wait_no_ack = yes
@@ -1445,8 +1445,8 @@  variants:
                         image_name = sles11-32
                         unattended_install:
                             unattended_file = unattended/SLES-11.xml
-                            floppy = images/sles-11-0-32/autoyast.vfd
-                            #cdrom_unattended = images/sles-11-0-32/autoyast.iso
+                            #floppy = images/sles-11-0-32/autoyast.vfd
+                            cdrom_unattended = images/sles-11-0-32/autoyast.iso
                             kernel = images/sles-11-0-32/linux
                             initrd = images/sles-11-0-32/initrd
                             boot_path = boot/i386/loader
@@ -1463,8 +1463,8 @@  variants:
                         md5sum_1m_cd1 = 00000951cab7c32e332362fc424c1054
                         unattended_install:
                             unattended_file = unattended/SLES-11.xml
-                            floppy = images/sles-11-0-64/autoyast.vfd
-                            #cdrom_unattended = images/sles-11-0-64/autoyast.iso
+                            #floppy = images/sles-11-0-64/autoyast.vfd
+                            cdrom_unattended = images/sles-11-0-64/autoyast.iso
                             kernel = images/sles-11-0-64/linux
                             initrd = images/sles-11-0-64/initrd
                             boot_path = boot/x86_64/loader
@@ -1478,8 +1478,8 @@  variants:
                         image_name = sles11sp1-32
                         unattended_install:
                             unattended_file = unattended/SLES-11.xml
-                            floppy = images/sles-11-1-32/autoyast.vfd
-                            #cdrom_unattended = images/sles-11-1-32/autoyast.iso
+                            #floppy = images/sles-11-1-32/autoyast.vfd
+                            cdrom_unattended = images/sles-11-1-32/autoyast.iso
                             kernel = images/sles-11-1-32/linux
                             initrd = images/sles-11-1-32/initrd
                             boot_path = boot/i386/loader
@@ -1492,8 +1492,8 @@  variants:
                         image_name = sles11sp1-64
                         unattended_install:
                             unattended_file = unattended/SLES-11.xml
-                            floppy = images/sles-11-1-64/autoyast.vfd
-                            #cdrom_unattended = images/sles-11-1-64/autoyast.iso
+                            #floppy = images/sles-11-1-64/autoyast.vfd
+                            cdrom_unattended = images/sles-11-1-64/autoyast.iso
                             kernel = images/sles-11-1-64/linux
                             initrd = images/sles-11-1-64/initrd
                             boot_path = boot/x86_64/loader