From patchwork Thu Oct 28 14:25:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 287772 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9SEPrcc001681 for ; Thu, 28 Oct 2010 14:25:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932535Ab0J1OZv (ORCPT ); Thu, 28 Oct 2010 10:25:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3225 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758941Ab0J1OZu (ORCPT ); Thu, 28 Oct 2010 10:25:50 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9SEPmIg030783 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 28 Oct 2010 10:25:49 -0400 Received: from freedom.redhat.com (vpn-9-107.rdu.redhat.com [10.11.9.107]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9SEPkjn017375; Thu, 28 Oct 2010 10:25:47 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH] KVM test: Make SUSE based distros to get back to unattended floppy Date: Thu, 28 Oct 2010 12:25:42 -0200 Message-Id: <1288275942-4287-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 28 Oct 2010 14:25:54 +0000 (UTC) diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 86b41e1..40ecf4a 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -946,8 +946,8 @@ variants: extra_params += " -boot cn" # You have to use autoyast=floppy if you want to use floppies to # hold your autoyast file - #kernel_args = "autoyast=floppy console=ttyS0,115200 console=tty0" - kernel_args = "autoyast=cdrom console=ttyS0,115200 console=tty0" + kernel_args = "autoyast=floppy console=ttyS0,115200 console=tty0" + #kernel_args = "autoyast=cdrom console=ttyS0,115200 console=tty0" post_install_delay = 10 variants: @@ -961,7 +961,8 @@ variants: unattended_install.cdrom: unattended_file = unattended/OpenSUSE-11.xml tftp = images/opensuse-11-0-32/tftpboot - floppy = images/opensuse-11-0-32/floppy.img + floppy = images/opensuse-11-0-32/autoyast.vfd + #cdrom_unattended = images/opensuse-11-0-32/autoyast.iso pxe_dir = boot/i386/loader - 11.0.64: @@ -972,8 +973,8 @@ variants: unattended_install.cdrom: unattended_file = unattended/OpenSUSE-11.xml tftp = images/opensuse-11-0-64/tftpboot - #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 pxe_dir = boot/x86_64/loader - 11.1.32: @@ -986,8 +987,8 @@ variants: unattended_install.cdrom: unattended_file = unattended/OpenSUSE-11.xml tftp = images/opensuse-11-1-32/tftpboot - #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 pxe_dir = boot/i386/loader - 11.1.64: @@ -1000,8 +1001,8 @@ variants: unattended_install.cdrom: unattended_file = unattended/OpenSUSE-11.xml tftp = images/opensuse-11-1-64/tftpboot - #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 pxe_dir = boot/x86_64/loader - 11.2.32: @@ -1012,8 +1013,8 @@ variants: unattended_install.cdrom: unattended_file = unattended/OpenSUSE-11.xml tftp = images/opensuse-11-2-32/tftpboot - #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 pxe_dir = boot/i386/loader - 11.2.64: @@ -1024,8 +1025,8 @@ variants: unattended_install.cdrom: unattended_file = unattended/OpenSUSE-11.xml tftp = images/opensuse-11-2-64/tftpboot - #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 pxe_dir = boot/x86_64/loader - 11.3.32: @@ -1036,8 +1037,8 @@ variants: unattended_install.cdrom: unattended_file = unattended/OpenSUSE-11.xml tftp = images/opensuse-11-3-32/tftpboot - #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 pxe_dir = boot/i386/loader - 11.3.64: @@ -1048,8 +1049,8 @@ variants: unattended_install.cdrom: unattended_file = unattended/OpenSUSE-11.xml tftp = images/opensuse-11-3-64/tftpboot - #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 pxe_dir = boot/x86_64/loader - SLES: @@ -1061,8 +1062,8 @@ variants: extra_params += " -boot cn" # You have to use autoyast=floppy if you want to use floppies to # hold your autoyast file - #kernel_args = "autoyast=floppy console=ttyS0,115200 console=tty0" - kernel_args = "autoyast=cdrom console=ttyS0,115200 console=tty0" + kernel_args = "autoyast=floppy console=ttyS0,115200 console=tty0" + #kernel_args = "autoyast=cdrom console=ttyS0,115200 console=tty0" post_install_delay = 10 variants: @@ -1074,8 +1075,8 @@ variants: unattended_install.cdrom: unattended_file = unattended/SLES-11.xml tftp = images/sles-11-0-32/tftpboot - #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 pxe_dir = boot/i386/loader - 11.0.64: @@ -1086,8 +1087,8 @@ variants: unattended_install.cdrom: unattended_file = unattended/SLES-11.xml tftp = images/sles-11-0-64/tftpboot - #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 pxe_dir = boot/x86_64/loader - 11.1.32: @@ -1098,8 +1099,8 @@ variants: unattended_install: unattended_file = unattended/SLES-11.xml tftp = images/sles-11-1-32/tftpboot - #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 pxe_dir = boot/i386/loader - 11.1.64: @@ -1110,8 +1111,8 @@ variants: unattended_install: unattended_file = unattended/SLES-11.xml tftp = images/sles-11-1-64/tftpboot - #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 pxe_dir = boot/x86_64/loader - @Ubuntu: