| Index: client/tests/kvm/tests_base.cfg.sample
 | 
| diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
 | 
| index 6374923fa7e224ab43a6fdc8c45c75ee73e76652..eddc02b0526a1839c39ececd1e83385028620ab1 100644
 | 
| --- a/client/tests/kvm/tests_base.cfg.sample
 | 
| +++ b/client/tests/kvm/tests_base.cfg.sample
 | 
| @@ -61,10 +61,7 @@ run_tcpdump = yes
 | 
|  # Misc
 | 
|  profilers = kvm_stat
 | 
|  login_timeout = 360
 | 
| -image_raw_device = no
 | 
|  
 | 
| -# NFS directory of guests' images
 | 
| -images_good = 0.0.0.0:/autotest/images_good
 | 
|  
 | 
|  # Tests
 | 
|  variants:
 | 
| @@ -78,12 +75,6 @@ variants:
 | 
|          kill_vm_timeout = 60
 | 
|          kill_vm_timeout_on_error = 0
 | 
|  
 | 
| -    - image_copy:
 | 
| -        type = image_copy
 | 
| -        vms = ''
 | 
| -        parallel = no
 | 
| -        profilers =
 | 
| -
 | 
|      - setup:        install
 | 
|          type = steps
 | 
|          fail_if_stuck_for = 300
 | 
| @@ -109,19 +100,23 @@ variants:
 | 
|                  medium = cdrom
 | 
|                  nic_mode = user
 | 
|                  redirs += " unattended_install"
 | 
| +                kernel =
 | 
| +                initrd = 
 | 
|              # Install guest from http/ftp url
 | 
|              - url:
 | 
|                  medium = url
 | 
| +                extra_params += " --append ks=floppy"
 | 
|                  url = REPLACE_THIS_WITH_TREE_URL
 | 
|              # Install guest from nfs nfs_server:nfs_dir
 | 
|              - nfs:
 | 
|                  medium = nfs
 | 
| +                extra_params += " --append ks=floppy"
 | 
|                  nfs_server = REPLACE_THIS_WITH_NFS_SERVER
 | 
|                  nfs_dir = REPLACE_THIS_WITH_NFS_DIRECTORY
 | 
|              # Install guest with a remote kickstart
 | 
|              - remote_ks:
 | 
|                  medium = url
 | 
| -                extra_params = " --append ks=REPLACE_THIS_WITH_URL_OF_KS"
 | 
| +                extra_params += " --append ks=REPLACE_THIS_WITH_URL_OF_KS"
 | 
|                  url = REPLACE_THIS_WITH_TREE_URL
 | 
|  
 | 
|      - boot:         install setup unattended_install.cdrom
 | 
| @@ -146,9 +141,6 @@ variants:
 | 
|          iterations = 2
 | 
|          used_mem = 1024
 | 
|          mig_timeout = 3600
 | 
| -        # you can uncomment the following line to enable the state
 | 
| -        # check
 | 
| -        # vmstate_check = yes
 | 
|          variants:
 | 
|              - tcp:
 | 
|                  migration_protocol = "tcp"
 | 
| @@ -159,27 +151,6 @@ variants:
 | 
|              - mig_cancel:
 | 
|                  migration_protocol = "tcp"
 | 
|                  mig_cancel = True
 | 
| -        variants:
 | 
| -            - @default:
 | 
| -            - with_reboot:
 | 
| -                iterations = 1
 | 
| -                type = migration_with_reboot
 | 
| -            - with_file_transfer:
 | 
| -                iterations = 1
 | 
| -                type = migration_with_file_transfer
 | 
| -
 | 
| -    - migrate_multi_host:      install setup unattended_install.cdrom
 | 
| -        type = migration_multi_host
 | 
| -        migration_test_command = help
 | 
| -        migration_bg_command = "cd /tmp; nohup tcpdump -q -t ip host localhost"
 | 
| -        migration_bg_check_command = pgrep tcpdump
 | 
| -        migration_bg_kill_command = pkill tcpdump
 | 
| -        kill_vm_on_error = yes
 | 
| -        iterations = 2
 | 
| -        used_mem = 1024
 | 
| -        mig_timeout = 3600
 | 
| -        comm_port = 13234
 | 
| -        regain_ip_cmd = dhclient
 | 
|  
 | 
|      - boot_savevm: install setup unattended_install.cdrom
 | 
|          type = boot_savevm
 | 
| @@ -320,7 +291,7 @@ variants:
 | 
|          reboot = yes
 | 
|          variants:
 | 
|              - autoit:
 | 
| -                interpreter = "cmd /c D:\AutoIt3.exe"
 | 
| +                interpreter = D:\AutoIt3.exe
 | 
|                  variants:
 | 
|                      - notepad:
 | 
|                          guest_script = autoit/notepad1.au3
 | 
| @@ -332,7 +303,7 @@ variants:
 | 
|                          dst_rsc_dir = "C:\"
 | 
|                          dst_rsc_path = "C:\autoit\stub\stub.au3"
 | 
|              - powershell:
 | 
| -                interpreter = "cmd /c powershell.exe -File"
 | 
| +                interpreter = "powershell.exe -File"
 | 
|                  variants:
 | 
|                      - stub:
 | 
|                          download = yes
 | 
| @@ -346,7 +317,7 @@ variants:
 | 
|          iozone_cmd = "D:\IOzone\iozone.exe -a"
 | 
|          iozone_timeout = 3600
 | 
|  
 | 
| -    - whql:         install setup unattended_install.cdrom
 | 
| +    - @whql:         install setup unattended_install.cdrom
 | 
|          nic_mode = tap
 | 
|          # Replace this with the address of an installed DTM server
 | 
|          server_address = 10.20.30.40
 | 
| @@ -356,26 +327,11 @@ variants:
 | 
|          server_shell_port = 10022
 | 
|          server_file_transfer_port = 10023
 | 
|          server_studio_path = %programfiles%\Microsoft Driver Test Manager\Studio
 | 
| -        dsso_test_binary = deps/whql_submission_15.exe
 | 
| -        dsso_delete_machine_binary = deps/whql_delete_machine_15.exe
 | 
|          wtt_services = wttsvc
 | 
|          variants:
 | 
| -            - support_vm_install:
 | 
| -                # The support VM is identical to the tested VM in every way
 | 
| -                # except for the image name which ends with '-supportvm'.
 | 
| -                type = unattended_install
 | 
| -                pre_command += " scripts/unattended.py;"
 | 
| -                extra_params += " -boot d"
 | 
| -                force_create_image = yes
 | 
| -                kill_vm = yes
 | 
| -                nic_mode = user
 | 
| -                redirs += " unattended_install"
 | 
| -                guest_port_unattended_install = 12323
 | 
| -                medium = cdrom
 | 
| -                kernel =
 | 
| -                initrd = 
 | 
| -            - client_install:    support_vm_install
 | 
| +            - whql_client_install:
 | 
|                  type = whql_client_install
 | 
| +                dsso_delete_machine_binary = deps/whql_delete_machine_15.exe
 | 
|                  # The username and password are required for accessing the DTM client
 | 
|                  # installer binary shared by the server
 | 
|                  server_username = administrator
 | 
| @@ -384,22 +340,12 @@ variants:
 | 
|                  # (the final cmd will be something like \\servername\DTMInstall\...)
 | 
|                  install_cmd = \DTMInstall\Client\Setup.exe /passive
 | 
|                  install_timeout = 3600
 | 
| -                # The test will setup auto logon on the client machine using the
 | 
| -                # following username and password:
 | 
| -                client_username = DTMLLUAdminUser
 | 
| -                client_password = Testpassword,1
 | 
| -                # (These are created by the DTM client installer and should probably not
 | 
| -                # be changed.)
 | 
| -                variants:
 | 
| -                    - @original:
 | 
| -                    - support_vm:
 | 
| -            - submission:    client_install support_vm_install
 | 
| +            - whql_submission:    whql_client_install
 | 
|                  type = whql_submission
 | 
|                  extra_params += " -snapshot"
 | 
| -                restart_vm = yes
 | 
| -                cdroms =
 | 
| +                dsso_test_binary = deps/whql_submission_15.exe
 | 
|                  test_timeout = 3600
 | 
| -                device_data = cat0 cat1 cat2 cat3 prog desc virt filter logoarch logoos whqlos whqlqual
 | 
| +                device_data = cat0 cat1 cat2 cat3 logoarch logoos whqlos whqlqual prog desc filter virt
 | 
|                  descriptors = desc1 desc2 desc3
 | 
|                  # DeviceData names
 | 
|                  dd_name_cat0     = Category
 | 
| @@ -417,105 +363,43 @@ variants:
 | 
|                  # Common DeviceData data
 | 
|                  dd_data_filter   = FilterIfNoInf
 | 
|                  dd_data_virt     = True
 | 
| -                # Exclude jobs that have '(Manual)' in their names
 | 
| -                job_filter = ^((?!\(Manual\)).)*$
 | 
|                  variants:
 | 
| -                    - unclassified:
 | 
| -                        dd_data_cat0 = Device Fundamentals
 | 
| -                        dd_data_cat1 = System Fundamentals\Dynamic Partitioning
 | 
| -                        dd_data_prog = Unclassified
 | 
| -                        dd_data_desc = Unclassified
 | 
| -                        dd_data_whqlqual = Unclassified Signature
 | 
| -                        variants:
 | 
| -                            - tablet:
 | 
| -                                submission_name = tablet
 | 
| -                                extra_params += " -usbdevice tablet"
 | 
| -                                test_device = HID-compliant mouse
 | 
| -                                test_timeout = 36000
 | 
| -                    - device:
 | 
| +                    - keyboard:
 | 
| +                        # test_device is a regular expression that should match a device's
 | 
| +                        # name as it appears in device manager.  The first device that matches
 | 
| +                        # is used.
 | 
| +                        test_device = keyboard
 | 
| +                        # Set timeout to 10 hours
 | 
| +                        test_timeout = 36000
 | 
| +                        dd_data_cat0 = Input\Keyboard
 | 
| +                        dd_data_cat1 = Device Fundamentals
 | 
| +                        dd_data_cat2 = System Fundamentals\Dynamic Partitioning
 | 
| +                        dd_data_prog = InputKbd
 | 
| +                        dd_data_desc = Input > Keyboard
 | 
| +                    - hdd:
 | 
| +                        test_device = qemu harddisk
 | 
| +                        device_data += " ex0 ex1 ex2 ex3"
 | 
| +                        dd_data_cat0 = Storage\Device Class\Disk\Disk
 | 
| +                        dd_data_cat1 = Storage\Device Class\Disk\Fixed
 | 
| +                        dd_data_cat2 = Storage\Device Class\Disk\Bus\ATA
 | 
| +                        dd_data_cat3 = Device Fundamentals
 | 
| +                        dd_data_prog = StorHDD
 | 
| +                        dd_data_desc = Storage > Hard Disk Drive (HDD)
 | 
| +                        dd_name_ex0 = Storage_bus_type
 | 
| +                        dd_data_ex0 = ATA/ATAPI
 | 
| +                        dd_name_ex1 = Hybrid_HDD_Support
 | 
| +                        dd_data_ex1 = 0
 | 
| +                        dd_name_ex2 = Non_Rotating_Media
 | 
| +                        dd_data_ex2 = 0
 | 
| +                        dd_name_ex3 = Secure_Storage
 | 
| +                        dd_data_ex3 = 0
 | 
|                          variants:
 | 
| -                            - keyboard:
 | 
| -                                submission_name = keyboard
 | 
| -                                # test_device is a regular expression that should match a device's
 | 
| -                                # name as it appears in device manager.  The first device that matches
 | 
| -                                # is used.
 | 
| -                                test_device = keyboard
 | 
| -                                # Set timeout to 10 hours
 | 
| -                                test_timeout = 36000
 | 
| -                                dd_data_cat0 = Input\Keyboard
 | 
| -                                dd_data_cat1 = Device Fundamentals
 | 
| -                                dd_data_cat2 = System Fundamentals\Dynamic Partitioning
 | 
| -                                dd_data_prog = InputKbd
 | 
| -                                dd_data_desc = Input > Keyboard
 | 
| -                            - net:
 | 
| -                                submission_name = net
 | 
| -                                # Add a support machine and extra NICs
 | 
| -                                vms += " supportvm"
 | 
| -                                nics += " nic2 nic3"
 | 
| -                                test_device = RTL8139.*NIC$
 | 
| -                                test_timeout = 86400
 | 
| -                                dd_data_cat0 = Network\LAN (Ethernet)
 | 
| -                                dd_data_cat1 = Device Fundamentals
 | 
| -                                dd_data_cat2 = System Fundamentals\Dynamic Partitioning
 | 
| -                                dd_data_prog = NetLan
 | 
| -                                dd_data_desc = Network > LAN (Ethernet)
 | 
| -                                # Machine dimensions
 | 
| -                                dimensions = testrole
 | 
| -                                dim_name_testrole = NetDevice\TestRole
 | 
| -                                dim_value_testrole_vm1 = NdistestLanClient
 | 
| -                                dim_value_testrole_supportvm = NdistestLanServer
 | 
| -                                # Device selection for the NDISTest client machine
 | 
| -                                device_params_vm1 = testdev clientmsgdev clientsupportdev
 | 
| -                                dp_name_testdev = NdistestLanClientTestDevice
 | 
| -                                dp_regex_testdev = RTL8139.*NIC$
 | 
| -                                dp_name_clientmsgdev = NdistestLanClientMessageDevice
 | 
| -                                dp_regex_clientmsgdev = RTL8139.*NIC #2$
 | 
| -                                dp_name_clientsupportdev = NdistestLanClientSupportDevice0
 | 
| -                                dp_regex_clientsupportdev = RTL8139.*NIC #3$
 | 
| -                                # Device selection for the NDISTest server machine
 | 
| -                                device_params_supportvm = servermsgdev serversupportdev
 | 
| -                                dp_name_servermsgdev = NdistestLanServerMessageDevice
 | 
| -                                dp_regex_servermsgdev = RTL8139.*NIC$
 | 
| -                                dp_name_serversupportdev = NdistestLanServerSupportDevice0
 | 
| -                                dp_regex_serversupportdev = RTL8139.*NIC #2$
 | 
| -                            - hdd:
 | 
| -                                submission_name = hdd
 | 
| -                                # Run the tests on a non-system drive
 | 
| -                                # (match device names that contain 'QEMU HARDDISK' and do not contain '[C]')
 | 
| -                                test_device = ^(?=.*?\bQEMU HARDDISK\b)((?!\[C\]).)*$
 | 
| -                                device_data += " ex0 ex1 ex2 ex3"
 | 
| -                                dd_data_cat0 = Storage\Device Class\Disk\Disk
 | 
| -                                dd_data_cat1 = Storage\Device Class\Disk\Fixed
 | 
| -                                dd_data_cat2 = Storage\Device Class\Disk\Bus\ATA
 | 
| -                                dd_data_cat3 = Device Fundamentals
 | 
| -                                dd_data_prog = StorHDD
 | 
| -                                dd_data_desc = Storage > Hard Disk Drive (HDD)
 | 
| -                                dd_name_ex0 = Storage_bus_type
 | 
| -                                dd_data_ex0 = ATA/ATAPI
 | 
| -                                dd_name_ex1 = Hybrid_HDD_Support
 | 
| -                                dd_data_ex1 = 0
 | 
| -                                dd_name_ex2 = Non_Rotating_Media
 | 
| -                                dd_data_ex2 = 0
 | 
| -                                dd_name_ex3 = Secure_Storage
 | 
| -                                dd_data_ex3 = 0
 | 
| -                                # Add a 2nd disk which will become D:
 | 
| -                                images += " tmp"
 | 
| -                                image_name_tmp = tmp
 | 
| -                                image_size_tmp = 4G
 | 
| -                                force_create_image_tmp = yes
 | 
| -                                # Run diskpart to partition the 2nd disk
 | 
| -                                whql_pre_command = "echo select disk=1 > dp.txt && "
 | 
| -                                whql_pre_command += "echo create partition primary >> dp.txt && "
 | 
| -                                whql_pre_command += "echo assign letter=d >> dp.txt && "
 | 
| -                                whql_pre_command += "diskpart /s dp.txt & "
 | 
| -                                whql_pre_command += "format d: /fs:ntfs /q /y"
 | 
| -                                variants:
 | 
| -                                    - full:
 | 
| -                                        # Yes, 100 hours, this is not a mistake
 | 
| -                                        test_timeout = 360000
 | 
| -                                    - syscache_test:
 | 
| -                                        job_filter = syscache test
 | 
| -                                        test_timeout = 7200
 | 
| +                            - full:
 | 
| +                                # Yes, 100 hours, this is not a mistake
 | 
| +                                test_timeout = 360000
 | 
| +                            - syscache_test:
 | 
| +                                job_filter = syscache test
 | 
| +                                test_timeout = 7200
 | 
|  
 | 
|      - guest_s4:     install setup unattended_install.cdrom
 | 
|          type = guest_s4
 | 
| @@ -528,6 +412,7 @@ variants:
 | 
|          relogin_timeout = 240
 | 
|  
 | 
|      - nic_hotplug:  install setup unattended_install.cdrom
 | 
| +        type = pci_hotplug
 | 
|          pci_type = nic
 | 
|          reference_cmd = lspci
 | 
|          find_pci_cmd = 'lspci | tail -n1'
 | 
| @@ -543,12 +428,6 @@ variants:
 | 
|              - nic_e1000:
 | 
|                  pci_model = e1000
 | 
|                  match_string = "Gigabit Ethernet Controller"
 | 
| -        variants:
 | 
| -            - default:
 | 
| -                type = pci_hotplug
 | 
| -            - additional:
 | 
| -                type = nic_hotplug
 | 
| -
 | 
|  
 | 
|      - block_hotplug: install setup unattended_install.cdrom
 | 
|          type = pci_hotplug
 | 
| @@ -570,7 +449,7 @@ variants:
 | 
|                  match_string = "Virtio block device"
 | 
|              - block_scsi:
 | 
|                  pci_model = scsi
 | 
| -                match_string = "LSI Logic"
 | 
| +                match_string = "SCSI"
 | 
|          variants:
 | 
|              - fmt_qcow2:
 | 
|                  image_format_stg = qcow2
 | 
| @@ -651,41 +530,17 @@ variants:
 | 
|          type = netperf
 | 
|          nic_mode = tap
 | 
|          netperf_files = netperf-2.4.5.tar.bz2 wait_before_data.patch
 | 
| -        packet_size = 1500
 | 
|          setup_cmd = "cd %s && tar xvfj netperf-2.4.5.tar.bz2 && cd netperf-2.4.5 && patch -p0 < ../wait_before_data.patch && ./configure && make"
 | 
|          netserver_cmd =  %s/netperf-2.4.5/src/netserver
 | 
| -	variants:
 | 
| -	    - stream:
 | 
| -	            netperf_cmd = %s/netperf-2.4.5/src/netperf -t %s -H %s -l 60 -- -m %s
 | 
| -		    protocols = "TCP_STREAM TCP_MAERTS TCP_SENDFILE UDP_STREAM"
 | 
| - 	    - rr:
 | 
| -	            netperf_cmd = %s/netperf-2.4.5/src/netperf -t %s -H %s -l 60 -- -r %s
 | 
| -		    protocols = "TCP_RR TCP_CRR UDP_RR"
 | 
| +        # test time is 60 seconds, set the buffer size to 1 for more hardware interrupt
 | 
| +        netperf_cmd = %s/netperf-2.4.5/src/netperf -t %s -H %s -l 60 -- -m 1
 | 
| +        protocols = "TCP_STREAM TCP_MAERTS TCP_RR TCP_CRR UDP_RR TCP_SENDFILE UDP_STREAM"
 | 
|  
 | 
|      - ethtool: install setup unattended_install.cdrom
 | 
|          type = ethtool
 | 
|          filesize = 512
 | 
|          nic_mode = tap
 | 
|  
 | 
| -    - nic_bonding:
 | 
| -        type = nic_bonding
 | 
| -        nics += ' nic2 nic3 nic4'
 | 
| -        image_snapshot = yes
 | 
| -        serial_login = yes
 | 
| -        test_timeout = 1000
 | 
| -        filesize = 4000
 | 
| -        transfer_timeout = 1000
 | 
| -        transfer_type = remote
 | 
| -        kill_vm = yes
 | 
| -
 | 
| -    - set_link:
 | 
| -        type = set_link
 | 
| -        test_timeout = 1000
 | 
| -        filesize = 4000
 | 
| -        transfer_timeout = 1000
 | 
| -        transfer_type = remote
 | 
| -        kill_vm =yes
 | 
| -
 | 
|      - physical_resources_check: install setup unattended_install.cdrom
 | 
|          type = physical_resources_check
 | 
|          catch_uuid_cmd = dmidecode | awk -F: '/UUID/ {print $2}'
 | 
| @@ -761,15 +616,6 @@ variants:
 | 
|              - vmexit:
 | 
|                  case = vmexit
 | 
|  
 | 
| -    - module_probe:
 | 
| -        type = module_probe
 | 
| -        # You can specify your own module list, though it is not needed usually.
 | 
| -        # mod_list = kvm
 | 
| -        load_count = 100
 | 
| -        vms = ''
 | 
| -        profilers = ''
 | 
| -        take_regular_screendumps = no
 | 
| -
 | 
|      - ioquit:
 | 
|          type = ioquit
 | 
|          background_cmd = "for i in 1 2 3 4; do (nohup dd if=/dev/urandom of=/tmp/file bs=102400 count=10000000 &) done"
 | 
| @@ -818,27 +664,6 @@ variants:
 | 
|                  image_name_snapshot1 = sn1
 | 
|                  image_name_snapshot2 = sn2
 | 
|  
 | 
| -    - clock_getres: install setup unattended_install.cdrom
 | 
| -        type = clock_getres
 | 
| -
 | 
| -    - kdump: unattended_install.cdrom
 | 
| -        type = kdump
 | 
| -        # time waited for the completion of crash dump
 | 
| -        # crash_timeout = 360
 | 
| -        # command to add the crashkernel=X@Y to kernel cmd line
 | 
| -        # kernel_param_cmd = "grubby --update-kernel=`grubby --default-kernel` --args=crashkernel=128M@64M"
 | 
| -        # command to enable kdump service
 | 
| -        # kdump_enable_cmd = chkconfig kdump on && service kdump start
 | 
| -        # command to probe the crash kernel
 | 
| -        # crash_kernel_prob_cmd = "grep -q 1 /sys/kernel/kexec_crash_loaded"
 | 
| -
 | 
| -    - vmstop:
 | 
| -        type = vmstop
 | 
| -        # the path used to store the saved vm state
 | 
| -        # save_path = /tmp
 | 
| -        # clean the state file?
 | 
| -        clean_save = yes
 | 
| -
 | 
|      # system_powerdown, system_reset and shutdown *must* be the last ones
 | 
|      # defined (in this order), since the effect of such tests can leave
 | 
|      # the VM on a bad state.
 | 
| @@ -879,24 +704,13 @@ variants:
 | 
|          nic_model = virtio
 | 
|          # You can add advanced attributes on nic_extra_params such as mrg_rxbuf
 | 
|          #nic_extra_params =
 | 
| -        # You can add advanced attributes through netdev_extra_params
 | 
| -        # such as sndbuf, as an example, you can uncomment the
 | 
| -        # following lines to enable the vhost support ( only available
 | 
| -        # for tap )
 | 
| -        #netdev_extra_params = "vhost=on"
 | 
| +        # You can set vhost = yes to enable the vhost kernel backend
 | 
| +        # (This only works if nic_mode=tap)
 | 
| +        vhost = no
 | 
|          jumbo:
 | 
|              mtu = 65520
 | 
|          ethtool:
 | 
|              supported_features = "tx sg tso gso"
 | 
| -        whql.submission.device.net:
 | 
| -            test_device = VirtIO Ethernet Adapter$
 | 
| -            # Device selection for the NDISTest client machine
 | 
| -            dp_regex_testdev = VirtIO Ethernet Adapter$
 | 
| -            dp_regex_clientmsgdev = VirtIO Ethernet Adapter #2$
 | 
| -            dp_regex_clientsupportdev = VirtIO Ethernet Adapter #3$
 | 
| -            # Device selection for the NDISTest server machine
 | 
| -            dp_regex_servermsgdev = VirtIO Ethernet Adapter$
 | 
| -            dp_regex_serversupportdev = VirtIO Ethernet Adapter #2$
 | 
|  
 | 
|  # Guests
 | 
|  variants:
 | 
| @@ -915,7 +729,7 @@ variants:
 | 
|          mem_chk_cmd = dmidecode -t 17 | awk -F: '/Size/ {print $2}'
 | 
|          mem_chk_cur_cmd = grep MemTotal /proc/meminfo
 | 
|          cpu_chk_cmd = grep -c processor /proc/cpuinfo
 | 
| -        unattended_install:
 | 
| +        unattended_install.cdrom:
 | 
|              # If you want to use floppy to hold kickstarts,
 | 
|              # comment the 3 lines below
 | 
|              cdroms += " unattended"
 | 
| @@ -947,222 +761,162 @@ variants:
 | 
|              - Fedora:
 | 
|                  no setup
 | 
|                  shell_prompt = "^\[.*\][\#\$]\s*$"
 | 
| -                unattended_install:
 | 
| -                    boot_path = "images/pxeboot"
 | 
| +                unattended_install.cdrom:
 | 
| +                    pxe_dir = "images/pxeboot"
 | 
| +                    pxe_image = "vmlinuz"
 | 
| +                    pxe_initrd = "initrd.img"
 | 
| +                    tftp = "images/tftpboot"
 | 
| +                    bootp = "/pxelinux.0"
 | 
| +                    extra_params += " -boot cn"
 | 
|                      # You have to use ks=floppy if you want to use floppies to
 | 
|                      # hold your kickstart file
 | 
| -                    #extra_params += " --append 'ks=floppy nicdelay=60 console=ttyS0,115200 console=tty0'"
 | 
| -                    extra_params += " --append 'ks=cdrom nicdelay=60 console=ttyS0,115200 console=tty0'"
 | 
| +                    #kernel_args = "ks=floppy nicdelay=60 console=ttyS0,115200 console=tty0"
 | 
| +                    kernel_args = "ks=cdrom nicdelay=60 console=ttyS0,115200 console=tty0"
 | 
|  
 | 
|                  variants:
 | 
|                      - 8.32:
 | 
|                          no setup
 | 
|                          image_name = fc8-32
 | 
| +                        cdrom_cd1 = linux/Fedora-8-i386-DVD.iso
 | 
| +                        md5sum = dd6c79fddfff36d409d02242e7b10189
 | 
| +                        md5sum_1m = dabae451bb69fbbad0e505b25144b1f9
 | 
|                          install:
 | 
|                              steps = Fedora-8-i386.steps
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-8-i386-DVD.iso
 | 
| -                            md5sum_cd1 = dd6c79fddfff36d409d02242e7b10189
 | 
| -                            md5sum_1m_cd1 = dabae451bb69fbbad0e505b25144b1f9
 | 
| -                        unattended_install:
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/Fedora-8.ks
 | 
| +                            tftp = images/f8-32/tftpboot
 | 
|                              #floppy = images/f8-32/ks.vfd
 | 
|                              cdrom_unattended = images/f8-32/ks.iso
 | 
| -                            kernel = images/f8-32/vmlinuz
 | 
| -                            initrd = images/f8-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-8-i386-DVD.iso
 | 
| -                            md5sum_cd1 = dd6c79fddfff36d409d02242e7b10189
 | 
| -                            md5sum_1m_cd1 = dabae451bb69fbbad0e505b25144b1f9
 | 
|  
 | 
|                      - 8.64:
 | 
|                          no setup
 | 
|                          image_name = f8-64
 | 
| +                        cdrom_cd1 = linux/Fedora-8-x86_64-DVD.iso
 | 
| +                        md5sum = 2cb231a86709dec413425fd2f8bf5295
 | 
| +                        md5sum_1m = 145f6414e19492649a56c89f0a45e719
 | 
|                          install:
 | 
|                              steps = Fedora-8-64.steps
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-8-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = 2cb231a86709dec413425fd2f8bf5295
 | 
| -                            md5sum_1m_cd1 = 145f6414e19492649a56c89f0a45e719
 | 
| -                        unattended_install:
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/Fedora-8.ks
 | 
| +                            tftp = images/f8-64/tftpboot
 | 
|                              #floppy = images/f8-64/ks.vfd
 | 
|                              cdrom_unattended = images/f8-64/ks.iso
 | 
| -                            kernel = images/f8-64/vmlinuz
 | 
| -                            initrd = images/f8-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-8-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = 2cb231a86709dec413425fd2f8bf5295
 | 
| -                            md5sum_1m_cd1 = 145f6414e19492649a56c89f0a45e719
 | 
|  
 | 
|                      - 9.32:
 | 
|                          image_name = f9-32
 | 
| +                        cdrom_cd1 = linux/Fedora-9-i386-DVD.iso
 | 
| +                        md5sum = 72601f685ea8c808c303353d8bf4d307
 | 
| +                        md5sum_1m = f24fa25689e5863f1b99984c6feb787f
 | 
|                          install:
 | 
|                              steps = Fedora-9-i386.steps
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-9-i386-DVD.iso
 | 
| -                            md5sum_cd1 = 72601f685ea8c808c303353d8bf4d307
 | 
| -                            md5sum_1m_cd1 = f24fa25689e5863f1b99984c6feb787f
 | 
| -                        unattended_install:
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/Fedora-9.ks
 | 
| +                            tftp = images/f9-32/tftpboot
 | 
|                              #floppy = images/f9-32/ks.vfd
 | 
|                              cdrom_unattended = images/f9-32/ks.iso
 | 
| -                            kernel = images/f9-32/vmlinuz
 | 
| -                            initrd = images/f9-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-9-i386-DVD.iso
 | 
| -                            md5sum_cd1 = 72601f685ea8c808c303353d8bf4d307
 | 
| -                            md5sum_1m_cd1 = f24fa25689e5863f1b99984c6feb787f
 | 
| -
 | 
|  
 | 
|                      - 9.64:
 | 
|                          image_name = f9-64
 | 
| +                        cdrom_cd1 = linux/Fedora-9-x86_64-DVD.iso
 | 
| +                        md5sum = 05b2ebeed273ec54d6f9ed3d61ea4c96
 | 
| +                        md5sum_1m = 9822ab5097e37e8fe306ef2192727db4
 | 
|                          install:
 | 
|                              steps = Fedora-9-64.steps
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-9-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = 05b2ebeed273ec54d6f9ed3d61ea4c96
 | 
| -                            md5sum_1m_cd1 = 9822ab5097e37e8fe306ef2192727db4
 | 
| -                        unattended_install:
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/Fedora-9.ks
 | 
| +                            tftp = images/f9-64/tftpboot
 | 
|                              #floppy = images/f9-64/ks.vfd
 | 
|                              cdrom_unattended = images/f9-64/ks.iso
 | 
| -                            kernel = images/f9-64/vmlinuz
 | 
| -                            initrd = images/f9-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-9-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = 05b2ebeed273ec54d6f9ed3d61ea4c96
 | 
| -                            md5sum_1m_cd1 = 9822ab5097e37e8fe306ef2192727db4
 | 
| -
 | 
|  
 | 
|                      - 10.32:
 | 
|                          image_name = f10-32
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/Fedora-10-i386-DVD.iso
 | 
| +                        md5sum = 27e581edb392728c4a07d00d3fc5ced0
 | 
| +                        md5sum_1m = bd67c68bdf595e4ba7131ec702159181
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/Fedora-10.ks
 | 
| +                            tftp = images/f10-32/tftpboot
 | 
|                              #floppy = images/f10-32/ks.vfd
 | 
|                              cdrom_unattended = images/f10-32/ks.iso
 | 
| -                            kernel = images/f10-32/vmlinuz
 | 
| -                            initrd = images/f10-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-10-i386-DVD.iso
 | 
| -                            md5sum_cd1 = 27e581edb392728c4a07d00d3fc5ced0
 | 
| -                            md5sum_1m_cd1 = bd67c68bdf595e4ba7131ec702159181
 | 
|  
 | 
|                      - 10.64:
 | 
|                          image_name = f10-64
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/Fedora-10-x86_64-DVD.iso
 | 
| +                        sha1sum = f1e5ae7db6a1ba227de7294c4112385922388648
 | 
| +                        md5sum_1m = 732857cbf40c80c34683e874601d982c
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/Fedora-10.ks
 | 
| +                            tftp = images/f10-64/tftpboot
 | 
|                              #floppy = images/f10-64/ks.vfd
 | 
|                              cdrom_unattended = images/f10-64/ks.iso
 | 
| -                            kernel = images/f10-64/vmlinuz
 | 
| -                            initrd = images/f10-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-10-x86_64-DVD.iso
 | 
| -                            sha1sum_cd1 = f1e5ae7db6a1ba227de7294c4112385922388648
 | 
| -                            md5sum_1m_cd1 = 732857cbf40c80c34683e874601d982c
 | 
|  
 | 
|                      - 11.32:
 | 
|                          image_name = f11-32
 | 
| +                        cdrom_cd1 = linux/Fedora-11-i386-DVD.iso
 | 
| +                        md5sum = e3b1e2d1ba42aa4705fa5f41771b3927
 | 
| +                        md5sum_1m = dc8ddf90648c247339c721395aa49714
 | 
|                          install:
 | 
|                              steps = Fedora-11-32.steps
 | 
| -                        unattended_install:
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/Fedora-11.ks
 | 
| +                            tftp = images/f11-32/tftpboot
 | 
|                              #floppy = images/f11-32/ks.vfd
 | 
|                              cdrom_unattended = images/f11-32/ks.iso
 | 
| -                            kernel = images/f11-32/vmlinuz
 | 
| -                            initrd = images/f11-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-11-i386-DVD.iso
 | 
| -                            md5sum_cd1 = e3b1e2d1ba42aa4705fa5f41771b3927
 | 
| -                            md5sum_1m_cd1 = dc8ddf90648c247339c721395aa49714
 | 
|  
 | 
|                      - 11.64:
 | 
|                          image_name = f11-64
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/Fedora-11-x86_64-DVD.iso
 | 
| +                        md5sum = 9d419844adeb93120215fe7505c9bce8
 | 
| +                        md5sum_1m = 405ee05e2387a2e4328b008d5bcbdd1e
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/Fedora-11.ks
 | 
| +                            tftp = images/f11-64/tftpboot
 | 
|                              #floppy = images/f11-64/ks.vfd
 | 
|                              cdrom_unattended = images/f11-64/ks.iso
 | 
| -                            kernel = images/f11-64/vmlinuz
 | 
| -                            initrd = images/f11-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-11-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = 9d419844adeb93120215fe7505c9bce8
 | 
| -                            md5sum_1m_cd1 = 405ee05e2387a2e4328b008d5bcbdd1e
 | 
|  
 | 
|                      - 12.32:
 | 
|                          image_name = f12-32
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/Fedora-12-i386-DVD.iso
 | 
| +                        md5sum = 2c4c1c0d09f2fbcfd8ee6a0c5542eeb2
 | 
| +                        md5sum_1m = eee935d7f0cf2ef03f6ddce3a2a50050
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/Fedora-12.ks
 | 
| +                            tftp = images/f12-32/tftpboot
 | 
|                              #floppy = images/f12-32/ks.vfd
 | 
|                              cdrom_unattended = images/f12-32/ks.iso
 | 
| -                            kernel = images/f12-32/vmlinuz
 | 
| -                            initrd = images/f12-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-12-i386-DVD.iso
 | 
| -                            md5sum_cd1 = 2c4c1c0d09f2fbcfd8ee6a0c5542eeb2
 | 
| -                            md5sum_1m_cd1 = eee935d7f0cf2ef03f6ddce3a2a50050
 | 
|  
 | 
|                      - 12.64:
 | 
|                          image_name = f12-64
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/Fedora-12-x86_64-DVD.iso
 | 
| +                        md5sum = 6dd31e292cc2eb1140544e9b1ba61c56
 | 
| +                        md5sum_1m = 514efbd7698b55ff6768c8605438bfc5
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/Fedora-12.ks
 | 
| +                            tftp = images/f12-64/tftpboot
 | 
|                              #floppy = images/f12-64/ks.vfd
 | 
|                              cdrom_unattended = images/f12-64/ks.iso
 | 
| -                            kernel = images/f12-64/vmlinuz
 | 
| -                            initrd = images/f12-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-12-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = 6dd31e292cc2eb1140544e9b1ba61c56
 | 
| -                            md5sum_1m_cd1 = 514efbd7698b55ff6768c8605438bfc5
 | 
|  
 | 
|                      - 13.32:
 | 
|                          image_name = f13-32
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/Fedora-13-i386-DVD.iso
 | 
| +                        md5sum = 212fec517c2629b4b5eaf3662ac13136
 | 
| +                        md5sum_1m = 4e1578a6ed5a6e7cd03b8fb074030746
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/Fedora-13.ks
 | 
| +                            tftp = images/f13-32/tftpboot
 | 
|                              #floppy = images/f13-32/ks.vfd
 | 
|                              cdrom_unattended = images/f13-32/ks.iso
 | 
| -                            kernel = images/f13-32/vmlinuz
 | 
| -                            initrd = images/f13-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-13-i386-DVD.iso
 | 
| -                            md5sum_cd1 = 212fec517c2629b4b5eaf3662ac13136
 | 
| -                            md5sum_1m_cd1 = 4e1578a6ed5a6e7cd03b8fb074030746
 | 
|  
 | 
|                      - 13.64:
 | 
|                          image_name = f13-64
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/Fedora-13-x86_64-DVD.iso
 | 
| +                        md5sum = 6fbae6379cf27f36e1f2c7827ba7dc35
 | 
| +                        md5sum_1m = 68821b9de4d3b5975d6634334e7f47a6
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/Fedora-13.ks
 | 
| +                            tftp = images/f13-64/tftpboot
 | 
|                              #floppy = images/f13-64/ks.vfd
 | 
|                              cdrom_unattended = images/f13-64/ks.iso
 | 
| -                            kernel = images/f13-64/vmlinuz
 | 
| -                            initrd = images/f13-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-13-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = 6fbae6379cf27f36e1f2c7827ba7dc35
 | 
| -                            md5sum_1m_cd1 = 68821b9de4d3b5975d6634334e7f47a6
 | 
| -
 | 
| -                    - 14.32:
 | 
| -                        image_name = f14-32
 | 
| -                        unattended_install:
 | 
| -                            unattended_file = unattended/Fedora-14.ks
 | 
| -                            #floppy = images/f14-32/ks.vfd
 | 
| -                            cdrom_unattended = images/f14-32/ks.iso
 | 
| -                            kernel = images/f14-32/vmlinuz
 | 
| -                            initrd = images/f14-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-14-i386-DVD.iso
 | 
| -                            md5sum_cd1 = 1cc67641506d2f931d669b8d3528dded
 | 
| -                            md5sum_1m_cd1 = d314ab126dabab686111e6a0d71d2e67
 | 
| -
 | 
| -                    - 14.64:
 | 
| -                        image_name = f14-64
 | 
| -                        unattended_install:
 | 
| -                            unattended_file = unattended/Fedora-14.ks
 | 
| -                            #floppy = images/f14-64/ks.vfd
 | 
| -                            cdrom_unattended = images/f14-64/ks.iso
 | 
| -                            kernel = images/f14-64/vmlinuz
 | 
| -                            initrd = images/f14-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/Fedora-14-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = f2ebf941dc45f99ee3e8a457c9544552
 | 
| -                            md5sum_1m_cd1 = df029f9cffbc3517937a91124a1e0c3a
 | 
| -
 | 
|  
 | 
|  
 | 
|              - DSL-4.2.5:
 | 
| @@ -1170,232 +924,199 @@ variants:
 | 
|                  image_name = dsl-4.2.5
 | 
|                  install:
 | 
|                      steps = DSL-4.2.5.steps
 | 
| -                    cdrom_cd1 = isos/linux/dsl-4.2.5.iso
 | 
| -                    md5sum_cd1 = 61694888aede3e01229865b8e6acd4a1
 | 
| -                    md5sum_1m_cd1 = 527f2481bd25310f2e3a6e5345ff3d12
 | 
| +                    cdrom_cd1 = linux/dsl-4.2.5.iso
 | 
| +                    md5sum = 61694888aede3e01229865b8e6acd4a1
 | 
| +                    md5sum_1m = 527f2481bd25310f2e3a6e5345ff3d12
 | 
|  
 | 
|              - Mandriva-One-2007:
 | 
|                  only install
 | 
|                  image_name = mandriva-one-2007
 | 
|                  steps = Mandriva-One-2007-32.steps
 | 
| -                cdrom_cd1 = isos/linux/mandriva-one-2007-i386.iso
 | 
| -                md5sum_cd1 = 7e9e183dc11b9d39f480238e4e12bb05
 | 
| -                md5sum_1m_cd1 = dc7865a75db665efc86d59bca7c1fe07
 | 
| +                cdrom_cd1 = linux/mandriva-one-2007-i386.iso
 | 
| +                md5sum = 7e9e183dc11b9d39f480238e4e12bb05
 | 
| +                md5sum_1m = dc7865a75db665efc86d59bca7c1fe07
 | 
|  
 | 
|              - OpenSUSE:
 | 
|                  no setup
 | 
|                  shell_prompt = ".*:.*\s#"
 | 
| -                unattended_install:
 | 
| +                unattended_install.cdrom:
 | 
| +                    pxe_image = "linux"
 | 
| +                    pxe_initrd = "initrd"
 | 
| +                    tftp = "images/tftpboot"
 | 
| +                    bootp = "/pxelinux.0"
 | 
| +                    extra_params += " -boot cn"
 | 
|                      # 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'"
 | 
| +                    kernel_args = "autoyast=floppy console=ttyS0,115200 console=tty0"
 | 
| +                    #kernel_args = "autoyast=cdrom console=ttyS0,115200 console=tty0"
 | 
|                      post_install_delay = 10
 | 
|  
 | 
|                  variants:
 | 
|                      - 11.0.32:
 | 
|                          image_name = openSUSE-11.0-32
 | 
| +                        cdrom_cd1 = linux/openSUSE-11.0-DVD-i386.iso
 | 
| +                        md5sum = ed6a5b3feb668866df812b1c2aed9d7f
 | 
| +                        md5sum_1m = c720b30557af758e69de450409516369
 | 
|                          install:
 | 
|                              steps = openSUSE-11.0-32.steps
 | 
| -                            cdrom_cd1 = isos/linux/openSUSE-11.0-DVD-i386.iso
 | 
| -                            md5sum_cd1 = ed6a5b3feb668866df812b1c2aed9d7f
 | 
| -                            md5sum_1m_cd1 = c720b30557af758e69de450409516369
 | 
| -                        unattended_install:
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/OpenSUSE-11.xml
 | 
| +                            tftp = images/opensuse-11-0-32/tftpboot
 | 
|                              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
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/openSUSE-11.0-DVD-i386.iso
 | 
| -                            md5sum_cd1 = ed6a5b3feb668866df812b1c2aed9d7f
 | 
| -                            md5sum_1m_cd1 = c720b30557af758e69de450409516369
 | 
| -
 | 
| +                            pxe_dir = boot/i386/loader
 | 
|  
 | 
|                      - 11.0.64:
 | 
|                          image_name = openSUSE-11.0-64
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/openSUSE-11.0-DVD-x86_64.iso
 | 
| +                        md5sum = 512c8346b0f8eb35f28c4eb96454d391
 | 
| +                        md5sum_1m = 661aa4cd031df2f25ea0102318a3f4d1
 | 
| +                        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
 | 
| -                            kernel = images/opensuse-11-0-64/linux
 | 
| -                            initrd = images/opensuse-11-0-64/initrd
 | 
| -                            boot_path = boot/x86_64/loader
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/openSUSE-11.0-DVD-x86_64.iso
 | 
| -                            md5sum_cd1 = 512c8346b0f8eb35f28c4eb96454d391
 | 
| -                            md5sum_1m_cd1 = 661aa4cd031df2f25ea0102318a3f4d1
 | 
| +                            pxe_dir = boot/x86_64/loader
 | 
|  
 | 
|                      - 11.1.32:
 | 
|                          image_name = openSUSE-11.1-32
 | 
| +                        cdrom_cd1 = linux/openSUSE-11.1-DVD-i586.iso
 | 
| +                        md5sum = 8f51b278c0415be28c5699e465444bd3
 | 
| +                        md5sum_1m = b70217417468389083429f81ba7ce2bd
 | 
|                          install:
 | 
| -                            steps = openSUSE-11.1-32-and-64.steps
 | 
| -                            cdrom_cd1 = isos/linux/openSUSE-11.1-DVD-i586.iso
 | 
| -                            md5sum_cd1 = 8f51b278c0415be28c5699e465444bd3
 | 
| -                            md5sum_1m_cd1 = b70217417468389083429f81ba7ce2bd
 | 
| -                        unattended_install:
 | 
| +                            steps=openSUSE-11.1-32-and-64.steps
 | 
| +                        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
 | 
| -                            kernel = images/opensuse-11-1-32/linux
 | 
| -                            initrd = images/opensuse-11-1-32/initrd
 | 
| -                            boot_path = boot/i386/loader
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/openSUSE-11.1-DVD-i586.iso
 | 
| -                            md5sum_cd1 = 8f51b278c0415be28c5699e465444bd3
 | 
| -                            md5sum_1m_cd1 = b70217417468389083429f81ba7ce2bd
 | 
| +                            pxe_dir = boot/i386/loader
 | 
|  
 | 
|                      - 11.1.64:
 | 
|                          image_name = openSUSE-11.1-64
 | 
| +                        cdrom_cd1 = linux/openSUSE-11.1-DVD-x86_64.iso
 | 
| +                        md5sum = 2afee1b8a87175e6dee2b8dbbd1ad8e8
 | 
| +                        md5sum_1m = 768ca32503ef92c28f2d144f2a87e4d0
 | 
|                          install:
 | 
|                              steps=openSUSE-11.1-32-and-64.steps
 | 
| -                            cdrom_cd1 = isos/linux/openSUSE-11.1-DVD-x86_64.iso
 | 
| -                            md5sum_cd1 = 2afee1b8a87175e6dee2b8dbbd1ad8e8
 | 
| -                            md5sum_1m_cd1 = 768ca32503ef92c28f2d144f2a87e4d0
 | 
| -                        unattended_install:
 | 
| +                        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
 | 
| -                            kernel = images/opensuse-11-1-64/linux
 | 
| -                            initrd = images/opensuse-11-1-64/initrd
 | 
| -                            boot_path = boot/x86_64/loader
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/openSUSE-11.1-DVD-x86_64.iso
 | 
| -                            md5sum_cd1 = 2afee1b8a87175e6dee2b8dbbd1ad8e8
 | 
| -                            md5sum_1m_cd1 = 768ca32503ef92c28f2d144f2a87e4d0
 | 
| -
 | 
| +                            pxe_dir = boot/x86_64/loader
 | 
|  
 | 
|                      - 11.2.32:
 | 
|                          image_name = openSUSE-11.2-32
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/openSUSE-11.2-DVD-i586.iso
 | 
| +                        md5sum = 295d713314a30ad017948f0d542c6d92
 | 
| +                        md5sum_1m = 1f8767d00acb492be5a5627c834e543f
 | 
| +                        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
 | 
| -                            kernel = images/opensuse-11-2-32/linux
 | 
| -                            initrd = images/opensuse-11-2-32/initrd
 | 
| -                            boot_path = boot/i386/loader
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/openSUSE-11.2-DVD-i586.iso
 | 
| -                            md5sum_cd1 = 295d713314a30ad017948f0d542c6d92
 | 
| -                            md5sum_1m_cd1 = 1f8767d00acb492be5a5627c834e543f
 | 
| -
 | 
| +                            pxe_dir = boot/i386/loader
 | 
|  
 | 
|                      - 11.2.64:
 | 
|                          image_name = openSUSE-11.2-64
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/openSUSE-11.2-DVD-x86_64.iso
 | 
| +                        md5sum = 6a09295e34dc030319d040f67f4742c6
 | 
| +                        md5sum_1m = 11fd11d39744450b898f04c371dde2e7
 | 
| +                        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
 | 
| -                            kernel = images/opensuse-11-2-64/linux
 | 
| -                            initrd = images/opensuse-11-2-64/initrd
 | 
| -                            boot_path = boot/x86_64/loader
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/openSUSE-11.2-DVD-x86_64.iso
 | 
| -                            md5sum_cd1 = 6a09295e34dc030319d040f67f4742c6
 | 
| -                            md5sum_1m_cd1 = 11fd11d39744450b898f04c371dde2e7
 | 
| +                            pxe_dir = boot/x86_64/loader
 | 
|  
 | 
|                      - 11.3.32:
 | 
|                          image_name = openSUSE-11.3-32
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/openSUSE-11.3-DVD-i586.iso
 | 
| +                        md5sum = 1a1da28c84e3cdad750d5cfa21c4fd17
 | 
| +                        md5sum_1m = 4dd26906ce6cb3946519cb0b0de4b0f8
 | 
| +                        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
 | 
| -                            kernel = images/opensuse-11-3-32/linux
 | 
| -                            initrd = images/opensuse-11-3-32/initrd
 | 
| -                            boot_path = boot/i386/loader
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/openSUSE-11.3-DVD-i586.iso
 | 
| -                            md5sum_cd1 = 1a1da28c84e3cdad750d5cfa21c4fd17
 | 
| -                            md5sum_1m_cd1 = 4dd26906ce6cb3946519cb0b0de4b0f8
 | 
| +                            pxe_dir = boot/i386/loader
 | 
|  
 | 
|                      - 11.3.64:
 | 
|                          image_name = openSUSE-11.3-64
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/openSUSE-11.3-DVD-x86_64.iso
 | 
| +                        md5sum = adf5d2a0a03c1e3aaf102fd6a4771b87
 | 
| +                        md5sum_1m = e0dd12dac30d296417256775e1234c6e
 | 
| +                        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
 | 
| -                            kernel = images/opensuse-11-3-64/linux
 | 
| -                            initrd = images/opensuse-11-3-64/initrd
 | 
| -                            boot_path = boot/x86_64/loader
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/openSUSE-11.3-DVD-x86_64.iso
 | 
| -                            md5sum_cd1 = adf5d2a0a03c1e3aaf102fd6a4771b87
 | 
| -                            md5sum_1m_cd1 = e0dd12dac30d296417256775e1234c6e
 | 
| +                            pxe_dir = boot/x86_64/loader
 | 
|  
 | 
|              - SLES:
 | 
|                  shell_prompt = "^root@.*[\#\$]\s*$|#"
 | 
| -                unattended_install:
 | 
| +                unattended_install.cdrom:
 | 
| +                    pxe_image = "linux"
 | 
| +                    pxe_initrd = "initrd"
 | 
| +                    bootp = "/pxelinux.0"
 | 
| +                    extra_params += " -boot cn"
 | 
|                      # 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'"
 | 
| +                    kernel_args = "autoyast=floppy console=ttyS0,115200 console=tty0"
 | 
| +                    #kernel_args = "autoyast=cdrom console=ttyS0,115200 console=tty0"
 | 
|                      post_install_delay = 10
 | 
| -                    kernel = linux
 | 
| -                    initrd = initrd
 | 
|  
 | 
|                  variants:
 | 
|                      - 11.0.32:
 | 
|                          image_name = sles11-32
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/SLES-11-DVD-i586-GM-DVD1.iso
 | 
| +                        md5sum = 4958d4dde2575666355c8a1c5858bab0
 | 
| +                        md5sum_1m = 1f19d4eff5bcead2a3e5b8b4212b6796
 | 
| +                        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
 | 
| -                            kernel = images/sles-11-0-32/linux
 | 
| -                            initrd = images/sles-11-0-32/initrd
 | 
| -                            boot_path = boot/i386/loader
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/SLES-11-DVD-i586-GM-DVD1.iso
 | 
| -                            md5sum_cd1 = 4958d4dde2575666355c8a1c5858bab0
 | 
| -                            md5sum_1m_cd1 = 1f19d4eff5bcead2a3e5b8b4212b6796
 | 
| -
 | 
| +                            pxe_dir = boot/i386/loader
 | 
|  
 | 
|                      - 11.0.64:
 | 
|                          image_name = sles11-64
 | 
| -                        cdrom_cd1 = isos/linux/SLES-11-DVD-x86_64-GM-DVD1.iso
 | 
| -                        md5sum_cd1 = 50a2bd45cd12c3808c3ee48208e2586b
 | 
| -                        md5sum_1m_cd1 = 00000951cab7c32e332362fc424c1054
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/SLES-11-DVD-x86_64-GM-DVD1.iso
 | 
| +                        md5sum = 50a2bd45cd12c3808c3ee48208e2586b
 | 
| +                        md5sum_1m = 00000951cab7c32e332362fc424c1054
 | 
| +                        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
 | 
| -                            kernel = images/sles-11-0-64/linux
 | 
| -                            initrd = images/sles-11-0-64/initrd
 | 
| -                            boot_path = boot/x86_64/loader
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/SLES-11-DVD-x86_64-GM-DVD1.iso
 | 
| -                            md5sum_cd1 = 50a2bd45cd12c3808c3ee48208e2586b
 | 
| -                            md5sum_1m_cd1 = 00000951cab7c32e332362fc424c1054
 | 
| -
 | 
| +                            pxe_dir = boot/x86_64/loader
 | 
|  
 | 
|                      - 11.1.32:
 | 
|                          image_name = sles11sp1-32
 | 
| +                        cdrom_cd1 = linux/SLES-11-SP1-DVD-i586-GM-DVD1.iso
 | 
| +                        md5sum = 0dd6886858d93501c38854552b9b1b0d
 | 
| +                        md5sum_1m = a626a3d50813410e3ac42794e05773bb
 | 
|                          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
 | 
| -                            kernel = images/sles-11-1-32/linux
 | 
| -                            initrd = images/sles-11-1-32/initrd
 | 
| -                            boot_path = boot/i386/loader
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/SLES-11-SP1-DVD-i586-GM-DVD1.iso
 | 
| -                            md5sum_cd1 = 0dd6886858d93501c38854552b9b1b0d
 | 
| -                            md5sum_1m_cd1 = a626a3d50813410e3ac42794e05773bb
 | 
| +                            pxe_dir = boot/i386/loader
 | 
|  
 | 
|                      - 11.1.64:
 | 
|                          image_name = sles11sp1-64
 | 
| +                        cdrom_cd1 = linux/SLES-11-SP1-DVD-x86_64-GM-DVD1.iso
 | 
| +                        md5sum = d2e10420f3689faa49a004b60fb396b7
 | 
| +                        md5sum_1m = f7f67b5da46923a9f01da8a2b6909654
 | 
|                          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
 | 
| -                            kernel = images/sles-11-1-64/linux
 | 
| -                            initrd = images/sles-11-1-64/initrd
 | 
| -                            boot_path = boot/x86_64/loader
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/SLES-11-SP1-DVD-x86_64-GM-DVD1.iso
 | 
| -                            md5sum_cd1 = d2e10420f3689faa49a004b60fb396b7
 | 
| -                            md5sum_1m_cd1 = f7f67b5da46923a9f01da8a2b6909654
 | 
| -
 | 
| +                            pxe_dir = boot/x86_64/loader
 | 
|  
 | 
|              - @Ubuntu:
 | 
|                  shell_prompt = "^root@.*[\#\$]\s*$"
 | 
| @@ -1405,16 +1126,16 @@ variants:
 | 
|                          only install
 | 
|                          image_name = ubuntu-6.10-32
 | 
|                          steps = Ubuntu-6.10-32.steps
 | 
| -                        cdrom_cd1 = isos/linux/ubuntu-6.10-desktop-i386.iso
 | 
| -                        md5sum_cd1 = 17fb825641571ce5888a718329efd016
 | 
| -                        md5sum_1m_cd1 = 7531d0a84e7451d17c5d976f1c3f8509
 | 
| +                        cdrom_cd1 = linux/ubuntu-6.10-desktop-i386.iso
 | 
| +                        md5sum = 17fb825641571ce5888a718329efd016
 | 
| +                        md5sum_1m = 7531d0a84e7451d17c5d976f1c3f8509
 | 
|  
 | 
|                      - Ubuntu-8.04-32:
 | 
|                          skip = yes
 | 
|                          image_name = ubuntu-8.04-32
 | 
|                          install:
 | 
|                              steps = Ubuntu-8.04-32.steps
 | 
| -                            cdrom_cd1 = isos/linux/ubuntu-8.04.1-desktop-i386.iso
 | 
| +                            cdrom_cd1 = linux/ubuntu-8.04.1-desktop-i386.iso
 | 
|                          setup:
 | 
|                              steps = Ubuntu-8.04-32-setupssh.steps
 | 
|  
 | 
| @@ -1422,9 +1143,9 @@ variants:
 | 
|                          image_name = ubuntu-8.10-server-32
 | 
|                          install:
 | 
|                              steps = Ubuntu-8.10-server-32.steps
 | 
| -                            cdrom_cd1 = isos/linux/ubuntu-8.10-server-i386.iso
 | 
| -                            md5sum_cd1 = a2ec9975a91e1228c8292ed9799dc302
 | 
| -                            md5sum_1m_cd1 = ea493eb8ef7722ead693492fd9f8a13f
 | 
| +                            cdrom_cd1 = linux/ubuntu-8.10-server-i386.iso
 | 
| +                            md5sum = a2ec9975a91e1228c8292ed9799dc302
 | 
| +                            md5sum_1m = ea493eb8ef7722ead693492fd9f8a13f
 | 
|                          setup:
 | 
|                              steps = Ubuntu-8.10-server-32-gcc.steps
 | 
|  
 | 
| @@ -1435,252 +1156,176 @@ variants:
 | 
|                      modprobe_module = acpiphp
 | 
|                  block_hotplug:
 | 
|                      modprobe_module = acpiphp
 | 
| -                unattended_install:
 | 
| -                    boot_path = images/pxeboot
 | 
| +                unattended_install.cdrom:
 | 
| +                    pxe_dir = "images/pxeboot"
 | 
| +                    pxe_image = "vmlinuz"
 | 
| +                    pxe_initrd = "initrd.img"
 | 
| +                    tftp = "images/tftpboot"
 | 
| +                    bootp = "/pxelinux.0"
 | 
| +                    extra_params += " -boot cn"
 | 
|                      # You have to use ks=floppy if you want to use floppies to
 | 
|                      # hold your kickstart file
 | 
| -                    #extra_params += " --append 'ks=floppy nicdelay=60 console=ttyS0,115200 console=tty0'"
 | 
| -                    extra_params += " --append 'ks=cdrom nicdelay=60 console=ttyS0,115200 console=tty0'"
 | 
| +                    #kernel_args = "ks=floppy nicdelay=60 console=ttyS0,115200 console=tty0"
 | 
| +                    kernel_args = "ks=cdrom nicdelay=60 console=ttyS0,115200 console=tty0"
 | 
|  
 | 
|                  variants:
 | 
|                      - 3.9.i386:
 | 
|                          no setup autotest linux_s3 guest_s4 shutdown
 | 
|                          image_name = rhel3-32
 | 
|                          mem_chk_cmd = dmidecode | awk -F: '/Maximum Capacity/ {print $2}'
 | 
| +                        cdrom_cd1 = linux/RHEL-3.9-i386-DVD.iso
 | 
| +                        md5sum = ddd11a1cb104119039b0fa05df6d52b8
 | 
| +                        md5sum_1m = 5f10c9417c7b8372b3456c1b5f3f9ed0
 | 
|                          install:
 | 
|                              steps=RHEL-3.9-i386.steps
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-3.9-i386-DVD.iso
 | 
| -                            md5sum_cd1 = ddd11a1cb104119039b0fa05df6d52b8
 | 
| -                            md5sum_1m_cd1 = 5f10c9417c7b8372b3456c1b5f3f9ed0
 | 
| -                        unattended_install:
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/RHEL-3-series.ks
 | 
| +                            tftp = images/rhel39-32/tftpboot
 | 
|                              #floppy = images/rhel39-32/ks.vfd
 | 
|                              cdrom_unattended = images/rhel39-32/ks.iso
 | 
| -                            kernel = images/rhel39-32/vmlinuz
 | 
| -                            initrd = images/rhel39-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-3.9-i386-DVD.iso
 | 
| -                            md5sum_cd1 = ddd11a1cb104119039b0fa05df6d52b8
 | 
| -                            md5sum_1m_cd1 = 5f10c9417c7b8372b3456c1b5f3f9ed0
 | 
|  
 | 
|                      - 3.9.x86_64:
 | 
|                          no setup autotest linux_s3 guest_s4 shutdown
 | 
|                          image_name = rhel3-64
 | 
|                          mem_chk_cmd = dmidecode | awk -F: '/Maximum Capacity/ {print $2}'
 | 
| +                        cdrom_cd1 = linux/RHEL-3.9-x86_64-DVD.iso
 | 
| +                        md5sum = bf4635e4a4bd3b43838e72bc8c329d55
 | 
| +                        md5sum_1m = 18ecd37b639109f1b2af05cfb57dfeaf
 | 
|                          install:
 | 
|                              steps=RHEL-3.9-x86_64.steps
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-3.9-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = bf4635e4a4bd3b43838e72bc8c329d55
 | 
| -                            md5sum_1m_cd1 = 18ecd37b639109f1b2af05cfb57dfeaf
 | 
| -                        unattended_install:
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/RHEL-3-series.ks
 | 
| +                            tftp = images/rhel39-64/tftpboot
 | 
|                              #floppy = images/rhel39-64/ks.vfd
 | 
|                              cdrom_unattended = images/rhel39-64/ks.iso
 | 
| -                            kernel = images/rhel39-64/vmlinuz
 | 
| -                            initrd = images/rhel39-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-3.9-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = bf4635e4a4bd3b43838e72bc8c329d55
 | 
| -                            md5sum_1m_cd1 = 18ecd37b639109f1b2af05cfb57dfeaf
 | 
| -
 | 
|  
 | 
|                      - 4.7.i386:
 | 
|                          no setup autotest
 | 
|                          image_name = rhel4-32
 | 
| +                        cdrom_cd1 = linux/RHEL-4.7-i386-DVD.iso
 | 
| +                        md5sum = ee5092653732a88ddbaf8eef2484c500
 | 
| +                        md5sum_1m = 127081cbed825d7232331a2083975528
 | 
|                          install:
 | 
|                              steps = RHEL-4.7-i386.steps
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-4.7-i386-DVD.iso
 | 
| -                            md5sum_cd1 = ee5092653732a88ddbaf8eef2484c500
 | 
| -                            md5sum_1m_cd1 = 127081cbed825d7232331a2083975528
 | 
| -                        unattended_install:
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/RHEL-4-series.ks
 | 
| +                            tftp = images/rhel47-32/tftpboot
 | 
|                              #floppy = images/rhel47-32/ks.vfd
 | 
|                              cdrom_unattended = images/rhel47-32/ks.iso
 | 
| -                            kernel = images/rhel47-32/vmlinuz
 | 
| -                            initrd = images/rhel47-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-4.7-i386-DVD.iso
 | 
| -                            md5sum_cd1 = ee5092653732a88ddbaf8eef2484c500
 | 
| -                            md5sum_1m_cd1 = 127081cbed825d7232331a2083975528
 | 
|  
 | 
|                      - 4.7.x86_64:
 | 
|                          no setup autotest
 | 
|                          image_name = rhel4-64
 | 
| +                        cdrom_cd1 = linux/RHEL-4.7-x86_64-DVD.iso
 | 
| +                        md5sum = ea9dae16dd86f7d94092d0e672333292
 | 
| +                        md5sum_1m = 58fa63eaee68e269f4cb1d2edf479792
 | 
|                          install:
 | 
|                              steps = RHEL-4.7-x86_64.steps
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-4.7-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = ea9dae16dd86f7d94092d0e672333292
 | 
| -                            md5sum_1m_cd1 = 58fa63eaee68e269f4cb1d2edf479792
 | 
| -                        unattended_install:
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/RHEL-4-series.ks
 | 
| +                            tftp = images/rhel47-64/tftpboot
 | 
|                              #floppy = images/rhel47-64/ks.vfd
 | 
|                              cdrom_unattended = images/rhel47-64/ks.iso
 | 
| -                            kernel = images/rhel47-64/vmlinuz
 | 
| -                            initrd = images/rhel47-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-4.7-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = ea9dae16dd86f7d94092d0e672333292
 | 
| -                            md5sum_1m_cd1 = 58fa63eaee68e269f4cb1d2edf479792
 | 
|  
 | 
|                      - 4.8.i386:
 | 
|                          no setup autotest
 | 
|                          image_name = rhel4-32
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/RHEL-4.8-i386-DVD.iso
 | 
| +                        md5sum = b024f0af5079539d3ef51f71fed0b194
 | 
| +                        md5sum_1m = 969c197402b9058f28a278c1f807d15b
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/RHEL-4-series.ks
 | 
| +                            tftp = images/rhel48-32/tftpboot
 | 
|                              #floppy = images/rhel48-32/ks.vfd
 | 
|                              cdrom_unattended = images/rhel48-32/ks.iso
 | 
| -                            kernel = images/rhel48-32/vmlinuz
 | 
| -                            initrd = images/rhel48-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-4.8-i386-DVD.iso
 | 
| -                            md5sum_cd1 = b024f0af5079539d3ef51f71fed0b194
 | 
| -                            md5sum_1m_cd1 = 969c197402b9058f28a278c1f807d15b
 | 
| -
 | 
|  
 | 
|                      - 4.8.x86_64:
 | 
|                          no setup autotest
 | 
|                          image_name = rhel4-64
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/RHEL-4.8-x86_64-DVD.iso
 | 
| +                        md5sum = 696bc877b0200cc942626673fcc3fc09
 | 
| +                        md5sum_1m = b11ac0ef7fd345ad712966972db63886
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/RHEL-4-series.ks
 | 
| +                            tftp = images/rhel48-64/tftpboot
 | 
|                              #floppy = images/rhel48-64/ks.vfd
 | 
|                              cdrom_unattended = images/rhel48-64/ks.iso
 | 
| -                            kernel = images/rhel48-64/vmlinuz
 | 
| -                            initrd = images/rhel48-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-4.8-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = 696bc877b0200cc942626673fcc3fc09
 | 
| -                            md5sum_1m_cd1 = b11ac0ef7fd345ad712966972db63886
 | 
| -
 | 
|  
 | 
|                      - 5.3.i386:
 | 
|                          no setup
 | 
|                          image_name = rhel5-32
 | 
| +                        cdrom_cd1 = linux/RHEL-5.3-i386-DVD.iso
 | 
| +                        md5sum = 371c62851611fd32ead440df6f24a296
 | 
| +                        md5sum_1m = 242318dd44152210f6ff6cdda1bfbf51
 | 
|                          install:
 | 
|                              steps = RHEL-5.3-i386.steps
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-5.3-i386-DVD.iso
 | 
| -                            md5sum_cd1 = 371c62851611fd32ead440df6f24a296
 | 
| -                            md5sum_1m_cd1 = 242318dd44152210f6ff6cdda1bfbf51
 | 
| -                        unattended_install:
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/RHEL-5-series.ks
 | 
| +                            tftp = images/rhel53-32/tftpboot
 | 
|                              #floppy = images/rhel53-32/ks.vfd
 | 
|                              cdrom_unattended = images/rhel53-32/ks.iso
 | 
| -                            kernel = images/rhel53-32/vmlinuz
 | 
| -                            initrd = images/rhel53-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-5.3-i386-DVD.iso
 | 
| -                            md5sum_cd1 = 371c62851611fd32ead440df6f24a296
 | 
| -                            md5sum_1m_cd1 = 242318dd44152210f6ff6cdda1bfbf51
 | 
| -
 | 
|  
 | 
|                      - 5.3.x86_64:
 | 
|                          no setup
 | 
|                          image_name = rhel5-64
 | 
| +                        cdrom_cd1 = linux/RHEL-5.3-x86_64-DVD.iso
 | 
| +                        md5sum = c5ed6b284410f4d8212cafc78fd7a8c5
 | 
| +                        md5sum_1m = b999f437583098ea5bbd56fb1de1d011
 | 
|                          install:
 | 
|                              steps=RHEL-5.3-x86_64.steps
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-5.3-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = c5ed6b284410f4d8212cafc78fd7a8c5
 | 
| -                            md5sum_1m_cd1 = b999f437583098ea5bbd56fb1de1d011
 | 
| -                        unattended_install:
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/RHEL-5-series.ks
 | 
| +                            tftp = images/rhel53-64/tftpboot
 | 
|                              #floppy = images/rhel53-64/ks.vfd
 | 
|                              cdrom_unattended = images/rhel53-64/ks.iso
 | 
| -                            kernel = images/rhel53-64/vmlinuz
 | 
| -                            initrd = images/rhel53-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-5.3-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = c5ed6b284410f4d8212cafc78fd7a8c5
 | 
| -                            md5sum_1m_cd1 = b999f437583098ea5bbd56fb1de1d011
 | 
| -
 | 
|  
 | 
|                      - 5.4.i386:
 | 
|                          no setup
 | 
|                          image_name = rhel5-32
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/RHEL-5.4-i386-DVD.iso
 | 
| +                        md5sum = 7a12ec6599527e4f3d1790b51eadbfed
 | 
| +                        md5sum_1m = 0dbeb8f58d213752d8c029e8601abfbb
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/RHEL-5-series.ks
 | 
| +                            tftp = images/rhel54-32/tftpboot
 | 
|                              #floppy = images/rhel54-32/ks.vfd
 | 
|                              cdrom_unattended = images/rhel54-32/ks.iso
 | 
| -                            kernel = images/rhel54-32/vmlinuz
 | 
| -                            initrd = images/rhel54-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-5.4-i386-DVD.iso
 | 
| -                            md5sum_cd1 = 7a12ec6599527e4f3d1790b51eadbfed
 | 
| -                            md5sum_1m_cd1 = 0dbeb8f58d213752d8c029e8601abfbb
 | 
| -
 | 
|  
 | 
|                      - 5.4.x86_64:
 | 
|                          no setup
 | 
|                          image_name = rhel5-64
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/RHEL-5.4-x86_64-DVD.iso
 | 
| +                        md5sum = 04fe3c10202402d7b389528d2bad0210
 | 
| +                        md5sum_1m = 3e74112003e88a966754849dbb8f5c3f
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/RHEL-5-series.ks
 | 
| +                            tftp = images/rhel54-64/tftpboot
 | 
|                              #floppy = images/rhel54-64/ks.vfd
 | 
|                              cdrom_unattended = images/rhel54-64/ks.iso
 | 
| -                            kernel = images/rhel54-64/vmlinuz
 | 
| -                            initrd = images/rhel54-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-5.4-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = 04fe3c10202402d7b389528d2bad0210
 | 
| -                            md5sum_1m_cd1 = 3e74112003e88a966754849dbb8f5c3f
 | 
| -
 | 
|  
 | 
|                      - 5.5.i386:
 | 
|                          no setup
 | 
|                          image_name = rhel5-32
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/RHEL-5.5-i386-DVD.iso
 | 
| +                        md5sum = 148858b157f275d9153797efddfc83c3
 | 
| +                        md5sum_1m = 2502cc7ddb9d0684fe08c4a83d247902
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/RHEL-5-series.ks
 | 
| +                            tftp = images/rhel55-32/tftpboot
 | 
|                              #floppy = images/rhel55-32/ks.vfd
 | 
|                              cdrom_unattended = images/rhel55-32/ks.iso
 | 
| -                            kernel = images/rhel55-32/vmlinuz
 | 
| -                            initrd = images/rhel55-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-5.5-i386-DVD.iso
 | 
| -                            md5sum_cd1 = 148858b157f275d9153797efddfc83c3
 | 
| -                            md5sum_1m_cd1 = 2502cc7ddb9d0684fe08c4a83d247902
 | 
| -
 | 
|  
 | 
|                      - 5.5.x86_64:
 | 
|                          no setup
 | 
|                          image_name = rhel5-64
 | 
| -                        unattended_install:
 | 
| +                        cdrom_cd1 = linux/RHEL-5.5-x86_64-DVD.iso
 | 
| +                        md5sum = f3119f883257ef9041234feda2f1cad0
 | 
| +                        md5sum_1m = a744084a03f6a08627f71527fc107a1e
 | 
| +                        unattended_install.cdrom:
 | 
|                              unattended_file = unattended/RHEL-5-series.ks
 | 
| +                            tftp = images/rhel55-64/tftpboot
 | 
|                              #floppy = images/rhel55-64/ks.vfd
 | 
|                              cdrom_unattended = images/rhel55-64/ks.iso
 | 
| -                            kernel = images/rhel55-64/vmlinuz
 | 
| -                            initrd = images/rhel55-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-5.5-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = f3119f883257ef9041234feda2f1cad0
 | 
| -                            md5sum_1m_cd1 = a744084a03f6a08627f71527fc107a1e
 | 
| -
 | 
| -
 | 
| -                    - 6.0.i386:
 | 
| -                        no setup
 | 
| -                        image_name = rhel6-32
 | 
| -                        unattended_install:
 | 
| -                            unattended_file = unattended/RHEL-6-series.ks
 | 
| -                            #floppy = images/rhel60-32/ks.vfd
 | 
| -                            cdrom_unattended = images/rhel60-32/ks.iso
 | 
| -                            kernel = images/rhel60-32/vmlinuz
 | 
| -                            initrd = images/rhel60-32/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-6.0-i386-DVD.iso
 | 
| -                            md5sum_cd1 = 291d234c93442405972689b4b41c14bc
 | 
| -                            md5sum_1m_cd1 = ee2cc3d3babe91a1d581a07099c4318b
 | 
| -
 | 
| -
 | 
| -                    - 6.0.x86_64:
 | 
| -                        no setup
 | 
| -                        image_name = rhel6-64
 | 
| -                        unattended_install:
 | 
| -                            unattended_file = unattended/RHEL-6-series.ks
 | 
| -                            #floppy = images/rhel60-64/ks.vfd
 | 
| -                            cdrom_unattended = images/rhel60-64/ks.iso
 | 
| -                            kernel = images/rhel60-64/vmlinuz
 | 
| -                            initrd = images/rhel60-64/initrd.img
 | 
| -                        unattended_install.cdrom:
 | 
| -                            cdrom_cd1 = isos/linux/RHEL-6.0-x86_64-DVD.iso
 | 
| -                            md5sum_cd1 = f7141396c6a19399d63e8c195354317d
 | 
| -                            md5sum_1m_cd1 = b060eeef63e2c8700db54ae02056e80c
 | 
| -
 | 
|  
 | 
|  
 | 
|      # Windows section
 | 
| @@ -1702,25 +1347,23 @@ variants:
 | 
|          guest_port_file_transfer = 10023
 | 
|  
 | 
|          # This ISO will be used for all tests except install:
 | 
| -        cdrom_cd1 = isos/windows/winutils.iso
 | 
| +        cdrom_cd1 = windows/winutils.iso
 | 
|  
 | 
|          cpu_chk_cmd = echo %NUMBER_OF_PROCESSORS%
 | 
|          mem_chk_cmd = wmic memphysical
 | 
|          mem_chk_cur_cmd = wmic memphysical
 | 
|  
 | 
| -        unattended_install.cdrom|whql.support_vm_install:
 | 
| +        unattended_install.cdrom:
 | 
|              timeout = 7200
 | 
|              finish_program = deps/finish.exe
 | 
|              cdroms += " winutils"
 | 
| -            cdrom_winutils = isos/windows/winutils.iso
 | 
| +            cdrom_winutils = windows/winutils.iso
 | 
|              drive_index_winutils = 2
 | 
| -            kernel =
 | 
| -            initrd =
 | 
|              # Turn install_virtio = yes if you want to install the
 | 
|              # Windows virtio drivers. It might be a lot of setup though :)
 | 
|              #install_virtio = no
 | 
|              #cdroms += " virtio"
 | 
| -            #cdrom_virtio = isos/windows/virtio-win.iso
 | 
| +            #cdrom_virtio = windows/virtio-win.iso
 | 
|              #drive_index_virtio = 3
 | 
|              #virtio_floppy = /usr/share/virtio-win/virtio-drivers.vfd
 | 
|          migrate:
 | 
| @@ -1728,10 +1371,6 @@ variants:
 | 
|              migration_bg_command = start ping -t localhost
 | 
|              migration_bg_check_command = tasklist | find /I "ping.exe"
 | 
|              migration_bg_kill_command = taskkill /IM ping.exe /F
 | 
| -        migrate.with_file_transfer:
 | 
| -            guest_path = C:\tmpfile
 | 
| -            rtl8139:
 | 
| -                file_size = 10
 | 
|          stress_boot:
 | 
|              alive_test_cmd = systeminfo
 | 
|          timedrift:
 | 
| @@ -1759,6 +1398,7 @@ variants:
 | 
|                  time_command = "echo TIME: %date% %time%"
 | 
|                  time_filter_re = "(?<=TIME: \w\w\w ).{19}(?=\.\d\d)"
 | 
|                  time_format = "%m/%d/%Y %H:%M:%S"
 | 
| +
 | 
|          guest_s4:
 | 
|              check_s4_support_cmd = powercfg /hibernate on
 | 
|              test_s4_cmd = start ping -t localhost
 | 
| @@ -1780,13 +1420,11 @@ variants:
 | 
|              find_pci_cmd = wmic diskdrive list brief
 | 
|              pci_test_cmd = echo select disk 1 > dt && echo online >> dt && echo detail disk >> dt && echo exit >> dt && diskpart /s dt
 | 
|          physical_resources_check:
 | 
| -            catch_uuid_cmd =
 | 
| +            catch_uuid_cmd = 
 | 
| +
 | 
|          file_transfer:
 | 
|              tmp_dir = C:\
 | 
|              clean_cmd = del
 | 
| -        vmstop:
 | 
| -            guest_path = C:\
 | 
| -
 | 
|          variants:
 | 
|              - Win2000:
 | 
|                  no reboot whql
 | 
| @@ -1794,16 +1432,16 @@ variants:
 | 
|                  kill_vm_gracefully = no
 | 
|                  install:
 | 
|                      steps = Win2000-32.steps
 | 
| -                    cdrom_cd1 = isos/windows/Windows2000_sp4.iso
 | 
| -                    md5sum_cd1 = dda6039f3a9173f0f6bfae40f5efdfea
 | 
| -                    md5sum_1m_cd1 = dd28fba196d366d56fe774bd93df5527
 | 
| +                    cdrom_cd1 = windows/Windows2000_sp4.iso
 | 
| +                    md5sum = dda6039f3a9173f0f6bfae40f5efdfea
 | 
| +                    md5sum_1m = dd28fba196d366d56fe774bd93df5527
 | 
|                      user = user
 | 
|                  setup:
 | 
|                      steps = Win2000-32-rss.steps
 | 
|                  unattended_install.cdrom:
 | 
| -                    cdrom_cd1 = isos/windows/Windows2000_sp4.iso
 | 
| -                    md5sum_cd1 = dda6039f3a9173f0f6bfae40f5efdfea
 | 
| -                    md5sum_1m_cd1 = dd28fba196d366d56fe774bd93df5527
 | 
| +                    cdrom_cd1 = windows/Windows2000_sp4.iso
 | 
| +                    md5sum = dda6039f3a9173f0f6bfae40f5efdfea
 | 
| +                    md5sum_1m = dd28fba196d366d56fe774bd93df5527
 | 
|                      unattended_file = unattended/win2000-32.sif
 | 
|                      floppy = images/win2000-32/answer.vfd
 | 
|  
 | 
| @@ -1813,17 +1451,17 @@ variants:
 | 
|                      - 32:
 | 
|                          image_name += -32
 | 
|                          install:
 | 
| -                            cdrom_cd1 = isos/windows/WindowsXP-sp2-vlk.iso
 | 
| -                            md5sum_cd1 = 743450644b1d9fe97b3cf379e22dceb0
 | 
| -                            md5sum_1m_cd1 = b473bf75af2d1269fec8958cf0202bfd
 | 
| +                            cdrom_cd1 = windows/WindowsXP-sp2-vlk.iso
 | 
| +                            md5sum = 743450644b1d9fe97b3cf379e22dceb0
 | 
| +                            md5sum_1m = b473bf75af2d1269fec8958cf0202bfd
 | 
|                              user = user
 | 
|                              steps = WinXP-32.steps
 | 
|                          setup:
 | 
|                              steps = WinXP-32-rss.steps
 | 
| -                        unattended_install.cdrom|whql.support_vm_install:
 | 
| -                            cdrom_cd1 = isos/windows/WindowsXP-sp2-vlk.iso
 | 
| -                            md5sum_cd1 = 743450644b1d9fe97b3cf379e22dceb0
 | 
| -                            md5sum_1m_cd1 = b473bf75af2d1269fec8958cf0202bfd
 | 
| +                        unattended_install.cdrom:
 | 
| +                            cdrom_cd1 = windows/WindowsXP-sp2-vlk.iso
 | 
| +                            md5sum = 743450644b1d9fe97b3cf379e22dceb0
 | 
| +                            md5sum_1m = b473bf75af2d1269fec8958cf0202bfd
 | 
|                              unattended_file = unattended/winxp32.sif
 | 
|                              floppy = images/winXP-32/answer.vfd
 | 
|                              # Uncomment virtio_network_installer_path line if
 | 
| @@ -1832,31 +1470,28 @@ variants:
 | 
|                              virtio_oemsetup_id = WXP32
 | 
|                              virtio_network_path = 'F:\NetKVM\xp\x86'
 | 
|                              #virtio_network_installer_path = 'F:\RHEV-Network32.msi'
 | 
| -                        whql.submission:
 | 
| +                        whql_submission:
 | 
|                              desc_path_desc1 = $\WDK\Logo Type\Device Logo\Windows XP
 | 
|                              desc_path_desc2 = $\WDK\Logo Type\Systems Logo\Windows XP
 | 
|                              dd_data_logoarch = X86
 | 
|                              dd_data_logoos = Windows XP
 | 
|                              dd_data_whqlos = Windows XP
 | 
| -                            device:
 | 
| -                                dd_data_whqlqual = Basic
 | 
| -                            device.net:
 | 
| -                                image_name_supportvm = winXP-32-supportvm
 | 
| +                            dd_data_whqlqual = Basic
 | 
|  
 | 
|                      - 64:
 | 
|                          image_name += -64
 | 
|                          install:
 | 
| -                            cdrom_cd1 = isos/windows/WindowsXP-64.iso
 | 
| -                            md5sum_cd1 = 8d3f007ec9c2060cec8a50ee7d7dc512
 | 
| -                            md5sum_1m_cd1 = e812363ff427effc512b7801ee70e513
 | 
| +                            cdrom_cd1 = windows/WindowsXP-64.iso
 | 
| +                            md5sum = 8d3f007ec9c2060cec8a50ee7d7dc512
 | 
| +                            md5sum_1m = e812363ff427effc512b7801ee70e513
 | 
|                              user = user
 | 
|                              steps = WinXP-64.steps
 | 
|                          setup:
 | 
|                              steps = WinXP-64-rss.steps
 | 
| -                        unattended_install.cdrom|whql.support_vm_install:
 | 
| -                            cdrom_cd1 = isos/windows/WindowsXP-64.iso
 | 
| -                            md5sum_cd1 = 8d3f007ec9c2060cec8a50ee7d7dc512
 | 
| -                            md5sum_1m_cd1 = e812363ff427effc512b7801ee70e513
 | 
| +                        unattended_install.cdrom:
 | 
| +                            cdrom_cd1 = windows/WindowsXP-64.iso
 | 
| +                            md5sum = 8d3f007ec9c2060cec8a50ee7d7dc512
 | 
| +                            md5sum_1m = e812363ff427effc512b7801ee70e513
 | 
|                              unattended_file = unattended/winxp64.sif
 | 
|                              floppy = images/winXP-64/answer.vfd
 | 
|                              # Uncomment virtio_network_installer_path line if
 | 
| @@ -1865,16 +1500,13 @@ variants:
 | 
|                              virtio_oemsetup_id = WNET64
 | 
|                              virtio_network_path = 'F:\NetKVM\xp\amd64'
 | 
|                              #virtio_network_installer_path = 'F:\RHEV-Network64.msi'
 | 
| -                        whql.submission:
 | 
| +                        whql_submission:
 | 
|                              desc_path_desc1 = $\WDK\Logo Type\Device Logo\Windows XP
 | 
|                              desc_path_desc2 = $\WDK\Logo Type\Systems Logo\Windows XP
 | 
|                              dd_data_logoarch = AMD64
 | 
|                              dd_data_logoos = Windows XP 64-Bit Edition Version 2003
 | 
|                              dd_data_whqlos = Windows XP x64
 | 
| -                            device:
 | 
| -                                dd_data_whqlqual = Basic
 | 
| -                            device.net:
 | 
| -                                image_name_supportvm = winXP-64-supportvm
 | 
| +                            dd_data_whqlqual = Basic
 | 
|  
 | 
|              - Win2003:
 | 
|                  image_name = win2003
 | 
| @@ -1884,17 +1516,17 @@ variants:
 | 
|                      - 32:
 | 
|                          image_name += -32
 | 
|                          install:
 | 
| -                            cdrom_cd1 = isos/windows/Windows2003_r2_VLK.iso
 | 
| -                            md5sum_cd1 = 03e921e9b4214773c21a39f5c3f42ef7
 | 
| -                            md5sum_1m_cd1 = 37c2fdec15ac4ec16aa10fdfdb338aa3
 | 
| +                            cdrom_cd1 = windows/Windows2003_r2_VLK.iso
 | 
| +                            md5sum = 03e921e9b4214773c21a39f5c3f42ef7
 | 
| +                            md5sum_1m = 37c2fdec15ac4ec16aa10fdfdb338aa3
 | 
|                              user = user
 | 
|                              steps = Win2003-32.steps
 | 
|                          setup:
 | 
|                              steps = Win2003-32-rss.steps
 | 
| -                        unattended_install.cdrom|whql.support_vm_install:
 | 
| -                            cdrom_cd1 = isos/windows/Windows2003_r2_VLK.iso
 | 
| -                            md5sum_cd1 = 03e921e9b4214773c21a39f5c3f42ef7
 | 
| -                            md5sum_1m_cd1 = 37c2fdec15ac4ec16aa10fdfdb338aa3
 | 
| +                        unattended_install.cdrom:
 | 
| +                            cdrom_cd1 = windows/Windows2003_r2_VLK.iso
 | 
| +                            md5sum = 03e921e9b4214773c21a39f5c3f42ef7
 | 
| +                            md5sum_1m = 37c2fdec15ac4ec16aa10fdfdb338aa3
 | 
|                              unattended_file = unattended/win2003-32.sif
 | 
|                              floppy = images/win2003-32/answer.vfd
 | 
|                              # Uncomment virtio_network_installer_path line if
 | 
| @@ -1903,30 +1535,27 @@ variants:
 | 
|                              virtio_oemsetup_id = WNET32
 | 
|                              virtio_network_path = 'F:\NetKVM\2k3\x86'
 | 
|                              #virtio_network_installer_path = 'F:\RHEV-Network32.msi'
 | 
| -                        whql.submission:
 | 
| +                        whql_submission:
 | 
|                              desc_path_desc1 = $\WDK\Logo Type\Device Logo\Windows Server 2003
 | 
|                              dd_data_logoarch = X86
 | 
|                              dd_data_logoos = Windows Server 2003
 | 
|                              dd_data_whqlos = Windows Server 2003
 | 
| -                            device:
 | 
| -                                dd_data_whqlqual = Basic
 | 
| -                            device.net:
 | 
| -                                image_name_supportvm = win2003-32-supportvm
 | 
| +                            dd_data_whqlqual = Basic
 | 
|  
 | 
|                      - 64:
 | 
|                          image_name += -64
 | 
|                          install:
 | 
| -                            cdrom_cd1 = isos/windows/Windows2003-x64.iso
 | 
| -                            md5sum_cd1 = 5703f87c9fd77d28c05ffadd3354dbbd
 | 
| -                            md5sum_1m_cd1 = 439393c384116aa09e08a0ad047dcea8
 | 
| +                            cdrom_cd1 = windows/Windows2003-x64.iso
 | 
| +                            md5sum = 5703f87c9fd77d28c05ffadd3354dbbd
 | 
| +                            md5sum_1m = 439393c384116aa09e08a0ad047dcea8
 | 
|                              user = user
 | 
|                              steps = Win2003-64.steps
 | 
|                          setup:
 | 
|                              steps = Win2003-64-rss.steps
 | 
| -                        unattended_install.cdrom|whql.support_vm_install:
 | 
| -                            cdrom_cd1 = isos/windows/Windows2003-x64.iso
 | 
| -                            md5sum_cd1 = 5703f87c9fd77d28c05ffadd3354dbbd
 | 
| -                            md5sum_1m_cd1 = 439393c384116aa09e08a0ad047dcea8
 | 
| +                        unattended_install.cdrom:
 | 
| +                            cdrom_cd1 = windows/Windows2003-x64.iso
 | 
| +                            md5sum = 5703f87c9fd77d28c05ffadd3354dbbd
 | 
| +                            md5sum_1m = 439393c384116aa09e08a0ad047dcea8
 | 
|                              unattended_file = unattended/win2003-64.sif
 | 
|                              floppy = images/win2003-64/answer.vfd
 | 
|                              # Uncomment virtio_network_installer_path line if
 | 
| @@ -1935,46 +1564,43 @@ variants:
 | 
|                              virtio_oemsetup_id = WNET64
 | 
|                              virtio_network_path = 'F:\NetKVM\2k3\amd64'
 | 
|                              #virtio_network_installer_path = 'F:\RHEV-Network64.msi'
 | 
| -                        whql.submission:
 | 
| +
 | 
| +                        whql_submission:
 | 
|                              desc_path_desc1 = $\WDK\Logo Type\Device Logo\Windows Server 2003
 | 
|                              dd_data_logoarch = AMD64
 | 
|                              dd_data_logoos = Windows Server 2003
 | 
|                              dd_data_whqlos = Windows Server 2003 x64
 | 
| -                            device:
 | 
| -                                dd_data_whqlqual = Basic
 | 
| -                            device.net:
 | 
| -                                image_name_supportvm = win2003-64-supportvm
 | 
| +                            dd_data_whqlqual = Basic
 | 
|  
 | 
|              - WinVista:
 | 
|                  image_name = winvista
 | 
|                  image_size = 20G
 | 
| -                whql.submission:
 | 
| +                whql_submission:
 | 
|                      desc_path_desc1 = $\WDK\Logo Type\Device Logo\Vista Client\Device Premium
 | 
|                      desc_path_desc2 = $\WDK\Logo Type\Device Logo\Vista Client\Device Standard
 | 
|                      desc_path_desc3 = $\WDK\Logo Type\Device Logo\Vista Client
 | 
|  
 | 
|                  variants:
 | 
|                      - 32:
 | 
| -                        whql.submission:
 | 
| +                        whql_submission:
 | 
|                              dd_data_logoarch = X86
 | 
|                              dd_data_logoos = Windows Vista
 | 
|                              dd_data_whqlos = Windows Vista Client
 | 
| -                            device:
 | 
| -                                dd_data_whqlqual = Premium
 | 
| +                            dd_data_whqlqual = Premium
 | 
|                          variants:
 | 
|                              - sp1:
 | 
|                                  image_name += -sp1-32
 | 
|                                  install:
 | 
| -                                    cdrom_cd1 = isos/windows/WindowsVista-32.iso
 | 
| -                                    md5sum_cd1 = 1008f323d5170c8e614e52ccb85c0491
 | 
| -                                    md5sum_1m_cd1 = c724e9695da483bc0fd59e426eaefc72
 | 
| +                                    cdrom_cd1 = windows/WindowsVista-32.iso
 | 
| +                                    md5sum = 1008f323d5170c8e614e52ccb85c0491
 | 
| +                                    md5sum_1m = c724e9695da483bc0fd59e426eaefc72
 | 
|                                      steps = Win-Vista-32.steps
 | 
|                                  setup:
 | 
|                                      steps = WinVista-32-rss.steps
 | 
| -                                unattended_install.cdrom|whql.support_vm_install:
 | 
| -                                    cdrom_cd1 = isos/windows/WindowsVista-32.iso
 | 
| -                                    md5sum_cd1 = 1008f323d5170c8e614e52ccb85c0491
 | 
| -                                    md5sum_1m_cd1 = c724e9695da483bc0fd59e426eaefc72
 | 
| +                                unattended_install.cdrom:
 | 
| +                                    cdrom_cd1 = windows/WindowsVista-32.iso
 | 
| +                                    md5sum = 1008f323d5170c8e614e52ccb85c0491
 | 
| +                                    md5sum_1m = c724e9695da483bc0fd59e426eaefc72
 | 
|                                      unattended_file = unattended/winvista-32-autounattend.xml
 | 
|                                      floppy = images/winvista-sp1-32/answer.vfd
 | 
|                                      # Uncomment virtio_network_installer_path line if
 | 
| @@ -1983,17 +1609,15 @@ variants:
 | 
|                                      virtio_storage_path = 'F:\viostor\w7\x86'
 | 
|                                      virtio_network_path = 'F:\NetKVM\w7\x86'
 | 
|                                      #virtio_network_installer_path = 'F:\RHEV-Network32.msi'
 | 
| -                                whql.submission.device.net:
 | 
| -                                    image_name_supportvm = winvista-sp1-32-supportvm
 | 
|  
 | 
|                              - sp2:
 | 
|                                  image_name += -sp2-32
 | 
| -                                unattended_install.cdrom|whql.support_vm_install:
 | 
| -                                    cdrom_cd1 = isos/windows/en_windows_vista_with_sp2_x86_dvd_342266.iso
 | 
| -                                    md5sum_cd1 = 19ca90a425667812977bab6f4ce24175
 | 
| -                                    md5sum_1m_cd1 = 89c15020e0e6125be19acf7a2e5dc614
 | 
| -                                    sha1sum_cd1 = 25ad9a776503e6a583bec07879dbcc5dfd20cd6e
 | 
| -                                    sha1sum_1m_cd1 = a2afa4cffdc1c362dbf9e62942337f4f875a22cf
 | 
| +                                unattended_install.cdrom:
 | 
| +                                    cdrom_cd1 = windows/en_windows_vista_with_sp2_x86_dvd_342266.iso
 | 
| +                                    md5sum = 19ca90a425667812977bab6f4ce24175
 | 
| +                                    md5sum_1m = 89c15020e0e6125be19acf7a2e5dc614
 | 
| +                                    sha1sum = 25ad9a776503e6a583bec07879dbcc5dfd20cd6e
 | 
| +                                    sha1sum_1m = a2afa4cffdc1c362dbf9e62942337f4f875a22cf
 | 
|                                      unattended_file = unattended/winvista-32-autounattend.xml
 | 
|                                      floppy = images/winvista-sp2-32/answer.vfd
 | 
|                                      # Uncomment virtio_network_installer_path line if
 | 
| @@ -2002,30 +1626,27 @@ variants:
 | 
|                                      virtio_storage_path = 'F:\viostor\w7\x86'
 | 
|                                      virtio_network_path = 'F:\NetKVM\w7\x86'
 | 
|                                      #virtio_network_installer_path = 'F:\RHEV-Network32.msi'
 | 
| -                                whql.submission.device.net:
 | 
| -                                    image_name_supportvm = winvista-sp2-32-supportvm
 | 
|  
 | 
|                      - 64:
 | 
| -                        whql.submission:
 | 
| +                        whql_submission:
 | 
|                              dd_data_logoarch = AMD64
 | 
|                              dd_data_logoos = Windows Vista
 | 
|                              dd_data_whqlos = Windows Vista Client x64
 | 
| -                            device:
 | 
| -                                dd_data_whqlqual = Premium
 | 
| +                            dd_data_whqlqual = Premium
 | 
|                          variants:
 | 
|                              - sp1:
 | 
|                                  image_name += -sp1-64
 | 
|                                  install:
 | 
| -                                    cdrom_cd1 = isos/windows/WindowsVista-64.iso
 | 
| -                                    md5sum_cd1 = 11e2010d857fffc47813295e6be6d58d
 | 
| -                                    md5sum_1m_cd1 = 0947bcd5390546139e25f25217d6f165
 | 
| +                                    cdrom_cd1 = windows/WindowsVista-64.iso
 | 
| +                                    md5sum = 11e2010d857fffc47813295e6be6d58d
 | 
| +                                    md5sum_1m = 0947bcd5390546139e25f25217d6f165
 | 
|                                      steps = Win-Vista-64.steps
 | 
|                                  setup:
 | 
|                                      steps = WinVista-64-rss.steps
 | 
| -                                unattended_install.cdrom|whql.support_vm_install:
 | 
| -                                    cdrom_cd1 = isos/windows/WindowsVista-64.iso
 | 
| -                                    md5sum_cd1 = 11e2010d857fffc47813295e6be6d58d
 | 
| -                                    md5sum_1m_cd1 = 0947bcd5390546139e25f25217d6f165
 | 
| +                                unattended_install.cdrom:
 | 
| +                                    cdrom_cd1 = windows/WindowsVista-64.iso
 | 
| +                                    md5sum = 11e2010d857fffc47813295e6be6d58d
 | 
| +                                    md5sum_1m = 0947bcd5390546139e25f25217d6f165
 | 
|                                      unattended_file = unattended/winvista-64-autounattend.xml
 | 
|                                      floppy = images/winvista-sp1-64/answer.vfd
 | 
|                                      # Uncomment virtio_network_installer_path line if
 | 
| @@ -2034,17 +1655,14 @@ variants:
 | 
|                                      virtio_storage_path = 'F:\viostor\w7\amd64'
 | 
|                                      virtio_network_path = 'F:\NetKVM\w7\amd64'
 | 
|                                      #virtio_network_installer_path = 'F:\RHEV-Network64.msi'
 | 
| -                                whql.submission.device.net:
 | 
| -                                    image_name_supportvm = winvista-sp1-64-supportvm
 | 
| -
 | 
|                              - sp2:
 | 
|                                  image_name += -sp2-64
 | 
| -                                unattended_install.cdrom|whql.support_vm_install:
 | 
| -                                    cdrom_cd1 = isos/windows/en_windows_vista_sp2_x64_dvd_342267.iso
 | 
| -                                    md5sum_cd1 = a1c024d7abaf34bac3368e88efbc2574
 | 
| -                                    md5sum_1m_cd1 = 3d84911a80f3df71d1026f7adedc2181
 | 
| -                                    sha1sum_cd1 = aaee3c04533899f9f8c4ae0c4250ef5fafbe29a3
 | 
| -                                    sha1sum_1m_cd1 = 1fd21bd3ce2a4de8856c7b8fe6fdf80260f6d1c7
 | 
| +                                unattended_install.cdrom:
 | 
| +                                    cdrom_cd1 = windows/en_windows_vista_sp2_x64_dvd_342267.iso
 | 
| +                                    md5sum = a1c024d7abaf34bac3368e88efbc2574
 | 
| +                                    md5sum_1m = 3d84911a80f3df71d1026f7adedc2181
 | 
| +                                    sha1sum = aaee3c04533899f9f8c4ae0c4250ef5fafbe29a3
 | 
| +                                    sha1sum_1m = 1fd21bd3ce2a4de8856c7b8fe6fdf80260f6d1c7
 | 
|                                      unattended_file = unattended/winvista-64-autounattend.xml
 | 
|                                      floppy = images/winvista-sp2-64/answer.vfd
 | 
|                                      # Uncomment virtio_network_installer_path line if
 | 
| @@ -2053,8 +1671,6 @@ variants:
 | 
|                                      virtio_storage_path = 'F:\viostor\w7\amd64'
 | 
|                                      virtio_network_path = 'F:\NetKVM\w7\amd64'
 | 
|                                      #virtio_network_installer_path = 'F:\RHEV-Network64.msi'
 | 
| -                                whql.submission.device.net:
 | 
| -                                    image_name_supportvm = winvista-sp2-64-supportvm
 | 
|  
 | 
|              - Win2008:
 | 
|                  no whql
 | 
| @@ -2067,16 +1683,16 @@ variants:
 | 
|                              - sp1:
 | 
|                                  image_name += -sp1-32
 | 
|                                  install:
 | 
| -                                    cdrom_cd1 = isos/windows/Windows2008-x86.iso
 | 
| +                                    cdrom_cd1 = windows/Windows2008-x86.iso
 | 
|                                      #en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso
 | 
|                                      md5sum=0bfca49f0164de0a8eba236ced47007d
 | 
|                                      md5sum_1m=07d7f5006393f74dc76e6e2e943e2440
 | 
| -                                    sha1sum_cd1 = 6ca018ff96f1e9b2b310a36546b6fded99a421e6
 | 
| +                                    sha1sum = 6ca018ff96f1e9b2b310a36546b6fded99a421e6
 | 
|                                      steps = Win2008-32.steps
 | 
|                                  setup:
 | 
|                                      steps = Win2008-32-rss.steps
 | 
| -                                unattended_install.cdrom|whql.support_vm_install:
 | 
| -                                    cdrom_cd1 = isos/windows/Windows2008-x86.iso
 | 
| +                                unattended_install.cdrom:
 | 
| +                                    cdrom_cd1 = windows/Windows2008-x86.iso
 | 
|                                      md5sum=0bfca49f0164de0a8eba236ced47007d
 | 
|                                      md5sum_1m=07d7f5006393f74dc76e6e2e943e2440
 | 
|                                      unattended_file = unattended/win2008-32-autounattend.xml
 | 
| @@ -2090,12 +1706,12 @@ variants:
 | 
|  
 | 
|                              - sp2:
 | 
|                                  image_name += -sp2-32
 | 
| -                                unattended_install.cdrom|whql.support_vm_install:
 | 
| -                                    cdrom_cd1 = isos/windows/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso
 | 
| -                                    md5sum_cd1 = b9201aeb6eef04a3c573d036a8780bdf
 | 
| -                                    md5sum_1m_cd1 = b7a9d42e55ea1e85105a3a6ad4da8e04
 | 
| -                                    sha1sum_cd1 = 49d0d6917c1256fe81048d414fa473bbc76a8724
 | 
| -                                    sha1sum_1m_cd1 = 9662ff7ed715faa00407e4befc484ea52a92a9fb
 | 
| +                                unattended_install.cdrom:
 | 
| +                                    cdrom_cd1 = windows/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso
 | 
| +                                    md5sum = b9201aeb6eef04a3c573d036a8780bdf
 | 
| +                                    md5sum_1m = b7a9d42e55ea1e85105a3a6ad4da8e04
 | 
| +                                    sha1sum = 49d0d6917c1256fe81048d414fa473bbc76a8724
 | 
| +                                    sha1sum_1m = 9662ff7ed715faa00407e4befc484ea52a92a9fb
 | 
|                                      unattended_file = unattended/win2008-32-autounattend.xml
 | 
|                                      floppy = images/win2008-sp2-32/answer.vfd
 | 
|                                      # Uncomment virtio_network_installer_path line if
 | 
| @@ -2111,16 +1727,16 @@ variants:
 | 
|                                  image_name += -sp1-64
 | 
|                                  install:
 | 
|                                      steps = Win2008-64.steps
 | 
| -                                    cdrom_cd1 = isos/windows/Windows2008-x64.iso
 | 
| +                                    cdrom_cd1 = windows/Windows2008-x64.iso
 | 
|                                      #en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso
 | 
|                                      md5sum=27c58cdb3d620f28c36333a5552f271c
 | 
|                                      md5sum_1m=efdcc11d485a1ef9afa739cb8e0ca766
 | 
| -                                    sha1sum_cd1 = bd000374709f67e9358814db6ec8f0ddaaa16f70
 | 
| +                                    sha1sum = bd000374709f67e9358814db6ec8f0ddaaa16f70
 | 
|                                      passwd = 1q2w3eP
 | 
|                                  setup:
 | 
|                                      steps = Win2008-64-rss.steps
 | 
| -                                unattended_install.cdrom|whql.support_vm_install:
 | 
| -                                    cdrom_cd1 = isos/windows/Windows2008-x64.iso
 | 
| +                                unattended_install.cdrom:
 | 
| +                                    cdrom_cd1 = windows/Windows2008-x64.iso
 | 
|                                      md5sum=27c58cdb3d620f28c36333a5552f271c
 | 
|                                      md5sum_1m=efdcc11d485a1ef9afa739cb8e0ca766
 | 
|                                      unattended_file = unattended/win2008-64-autounattend.xml
 | 
| @@ -2134,12 +1750,12 @@ variants:
 | 
|  
 | 
|                              - sp2:
 | 
|                                  image_name += -sp2-64
 | 
| -                                unattended_install.cdrom|whql.support_vm_install:
 | 
| -                                    cdrom_cd1 = isos/windows/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso
 | 
| -                                    md5sum_cd1 = e94943ef484035b3288d8db69599a6b5
 | 
| -                                    md5sum_1m_cd1 = ee55506823d0efffb5532ddd88a8e47b
 | 
| -                                    sha1sum_cd1 = 34c7d726c57b0f8b19ba3b40d1b4044c15fc2029
 | 
| -                                    sha1sum_1m_cd1 = 8fe08b03e3531906855a60a78020ac9577dff5ba
 | 
| +                                unattended_install.cdrom:
 | 
| +                                    cdrom_cd1 = windows/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso
 | 
| +                                    md5sum = e94943ef484035b3288d8db69599a6b5
 | 
| +                                    md5sum_1m = ee55506823d0efffb5532ddd88a8e47b
 | 
| +                                    sha1sum = 34c7d726c57b0f8b19ba3b40d1b4044c15fc2029
 | 
| +                                    sha1sum_1m = 8fe08b03e3531906855a60a78020ac9577dff5ba
 | 
|                                      unattended_file = unattended/win2008-64-autounattend.xml
 | 
|                                      floppy = images/win2008-sp2-64/answer.vfd
 | 
|                                      # Uncomment virtio_network_installer_path line if
 | 
| @@ -2151,12 +1767,12 @@ variants:
 | 
|  
 | 
|                              - r2:
 | 
|                                  image_name += -r2-64
 | 
| -                                unattended_install.cdrom|whql.support_vm_install:
 | 
| -                                    cdrom_cd1 = isos/windows/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso
 | 
| -                                    md5sum_cd1 = 0207ef392c60efdda92071b0559ca0f9
 | 
| -                                    md5sum_1m_cd1 = a5a22ce25008bd7109f6d830d627e3ed
 | 
| -                                    sha1sum_cd1 = ad855ea913aaec3f1d0e1833c1aef7a0de326b0a
 | 
| -                                    sha1sum_1m_cd1 = 9194a3aabae25b36e5f73cad001314b2c8d07d14
 | 
| +                                unattended_install.cdrom:
 | 
| +                                    cdrom_cd1 = windows/en_windows_server_2008_r2_standard_enterprise_datacenter_and_web_x64_dvd_x15-59754.iso
 | 
| +                                    md5sum = 0207ef392c60efdda92071b0559ca0f9
 | 
| +                                    md5sum_1m = a5a22ce25008bd7109f6d830d627e3ed
 | 
| +                                    sha1sum = ad855ea913aaec3f1d0e1833c1aef7a0de326b0a
 | 
| +                                    sha1sum_1m = 9194a3aabae25b36e5f73cad001314b2c8d07d14
 | 
|                                      unattended_file = unattended/win2008-r2-autounattend.xml
 | 
|                                      floppy = images/win2008-r2-64/answer.vfd
 | 
|                                      # Uncomment virtio_network_installer_path line if
 | 
| @@ -2169,7 +1785,7 @@ variants:
 | 
|              - Win7:
 | 
|                  image_name = win7
 | 
|                  image_size = 20G
 | 
| -                whql.submission:
 | 
| +                whql_submission:
 | 
|                      desc_path_desc1 = $\WDK\Logo Type\Device Logo\Windows 7 Client\Logo
 | 
|                      desc_path_desc2 = $\WDK\Logo Type\Device Logo\Windows 7 Client
 | 
|                      device_data += " adq"
 | 
| @@ -2179,12 +1795,12 @@ variants:
 | 
|                  variants:
 | 
|                      - 32:
 | 
|                          image_name += -32
 | 
| -                        unattended_install.cdrom|whql.support_vm_install:
 | 
| -                            cdrom_cd1 = isos/windows/en_windows_7_ultimate_x86_dvd_x15-65921.iso
 | 
| -                            md5sum_cd1 = d0b8b407e8a3d4b75ee9c10147266b89
 | 
| -                            md5sum_1m_cd1 = 2b0c2c22b1ae95065db08686bf83af93
 | 
| -                            sha1sum_cd1 = 5395dc4b38f7bdb1e005ff414deedfdb16dbf610
 | 
| -                            sha1sum_1m_cd1 = 9f9c3780aebeb28a9bf22188eed6bc15475dc9c5
 | 
| +                        unattended_install.cdrom:
 | 
| +                            cdrom_cd1 = windows/en_windows_7_ultimate_x86_dvd_x15-65921.iso
 | 
| +                            md5sum = d0b8b407e8a3d4b75ee9c10147266b89
 | 
| +                            md5sum_1m = 2b0c2c22b1ae95065db08686bf83af93
 | 
| +                            sha1sum = 5395dc4b38f7bdb1e005ff414deedfdb16dbf610
 | 
| +                            sha1sum_1m = 9f9c3780aebeb28a9bf22188eed6bc15475dc9c5
 | 
|                              unattended_file = unattended/win7-32-autounattend.xml
 | 
|                              floppy = images/win7-32/answer.vfd
 | 
|                              # Uncomment virtio_network_installer_path line if
 | 
| @@ -2193,31 +1809,28 @@ variants:
 | 
|                              virtio_storage_path = 'F:\viostor\w7\x86'
 | 
|                              virtio_network_path = 'F:\NetKVM\w7\x86'
 | 
|                              #virtio_network_installer_path = 'F:\RHEV-Network32.msi'
 | 
| -                        whql.submission:
 | 
| +                        whql_submission:
 | 
|                              dd_data_logoarch = X86
 | 
|                              dd_data_logoos = Windows 7
 | 
|                              dd_data_whqlos = Windows 7 Client
 | 
| -                            device:
 | 
| -                                dd_data_whqlqual = Logo
 | 
| -                            device.net:
 | 
| -                                image_name_supportvm = win7-32-supportvm
 | 
| +                            dd_data_whqlqual = Logo
 | 
|  
 | 
|                      - 64:
 | 
|                          image_name += -64
 | 
|                          install:
 | 
| -                            cdrom_cd1 = isos/windows/en_windows_7_ultimate_x64_dvd_x15-65922.iso
 | 
| +                            cdrom_cd1 = windows/en_windows_7_ultimate_x64_dvd_x15-65922.iso
 | 
|                              md5sum=f43d22e4fb07bf617d573acd8785c028
 | 
|                              md5sum_1m=b44d8cf99dbed2a5cb02765db8dfd48f
 | 
|                              passwd = 1q2w3eP
 | 
|                              steps = Win7-64.steps
 | 
|                          setup:
 | 
|                              steps = Win7-64-rss.steps
 | 
| -                        unattended_install.cdrom|whql.support_vm_install:
 | 
| -                            cdrom_cd1 = isos/windows/en_windows_7_ultimate_x64_dvd_x15-65922.iso
 | 
| -                            md5sum_cd1 = f43d22e4fb07bf617d573acd8785c028
 | 
| -                            md5sum_1m_cd1 = b44d8cf99dbed2a5cb02765db8dfd48f
 | 
| -                            sha1sum_cd1 = 326327cc2ff9f05379f5058c41be6bc5e004baa7
 | 
| -                            sha1sum_1m_cd1 = 4a3903bd5157de54f0702e5263e0a683c5775515
 | 
| +                        unattended_install.cdrom:
 | 
| +                            cdrom_cd1 = windows/en_windows_7_ultimate_x64_dvd_x15-65922.iso
 | 
| +                            md5sum = f43d22e4fb07bf617d573acd8785c028
 | 
| +                            md5sum_1m = b44d8cf99dbed2a5cb02765db8dfd48f
 | 
| +                            sha1sum = 326327cc2ff9f05379f5058c41be6bc5e004baa7
 | 
| +                            sha1sum_1m = 4a3903bd5157de54f0702e5263e0a683c5775515
 | 
|                              unattended_file = unattended/win7-64-autounattend.xml
 | 
|                              floppy = images/win7-64/answer.vfd
 | 
|                              # Uncomment virtio_network_installer_path line if
 | 
| @@ -2226,14 +1839,11 @@ variants:
 | 
|                              virtio_storage_path = 'F:\viostor\w7\amd64'
 | 
|                              virtio_network_path = 'F:\NetKVM\w7\amd64'
 | 
|                              #virtio_network_installer_path = 'F:\RHEV-Network64.msi'
 | 
| -                        whql.submission:
 | 
| +                        whql_submission:
 | 
|                              dd_data_logoarch = AMD64
 | 
|                              dd_data_logoos = Windows 7
 | 
|                              dd_data_whqlos = Windows 7 Client x64
 | 
| -                            device:
 | 
| -                                dd_data_whqlqual = Logo
 | 
| -                            device.net:
 | 
| -                                image_name_supportvm = win7-64-supportvm
 | 
| +                            dd_data_whqlqual = Logo
 | 
|  
 | 
|  
 | 
|      # Unix/BSD section
 | 
| @@ -2248,16 +1858,16 @@ variants:
 | 
|                  image_name = NetBSD-1.6.2
 | 
|                  image_size = 4G
 | 
|                  steps = NetBSD-1.6.2.steps
 | 
| -                cdrom_cd1 = isos/bsd/netbsd-1.6.2-i386.iso
 | 
| +                cdrom_cd1 = bsd/netbsd-1.6.2-i386.iso
 | 
|                  md5sum=72eb680300f77d529bfbc880ba8208f3
 | 
|                  md5sum_1m=f1a9e1e825c90adfb1be35c6177bd9ac
 | 
|  
 | 
|              - OpenBSD-4.1:
 | 
|                  image_name = OpenBSD-4.1
 | 
|                  steps = OpenBSD-4.1-32.steps
 | 
| -                cdrom_cd1 = isos/unix/openbsd41-i386-07-05-06.iso
 | 
| -                md5sum_cd1 = 984790db10ebdd6fc7a9cf97abc7c967
 | 
| -                md5sum_1m_cd1 = 8fc234b4b0ecfe56843a32ac1d26ed55
 | 
| +                cdrom_cd1 = unix/openbsd41-i386-07-05-06.iso
 | 
| +                md5sum = 984790db10ebdd6fc7a9cf97abc7c967
 | 
| +                md5sum_1m = 8fc234b4b0ecfe56843a32ac1d26ed55
 | 
|  
 | 
|      # Live CD section
 | 
|      - @livecd:
 | 
| @@ -2269,31 +1879,27 @@ variants:
 | 
|          variants:
 | 
|              - Belenix:
 | 
|                  steps = Belenix-0.7.1.steps
 | 
| -                cdrom_cd1 = isos/unix/belenix_0.7.1.iso
 | 
| -                md5sum_cd1 = 29cea6160cf5250de138e2820e53e342
 | 
| -                md5sum_1m_cd1 = 427bbef1b85d6d051799b825d686ae94
 | 
| +                cdrom_cd1 = unix/belenix_0.7.1.iso
 | 
| +                md5sum = 29cea6160cf5250de138e2820e53e342
 | 
| +                md5sum_1m = 427bbef1b85d6d051799b825d686ae94
 | 
|  
 | 
|              - Slax:
 | 
|                  steps = Slax-6.0.7.steps
 | 
| -                cdrom_cd1 = isos/linux/slax-6.0.7.iso
 | 
| -                md5sum_cd1 = cde0ecba3c8289d786e12c44666ded6e
 | 
| -                md5sum_1m_cd1 = ddf02bc7444f22d1160a6e5a8fc8723f
 | 
| +                cdrom_cd1 = linux/slax-6.0.7.iso
 | 
| +                md5sum = cde0ecba3c8289d786e12c44666ded6e
 | 
| +                md5sum_1m = ddf02bc7444f22d1160a6e5a8fc8723f
 | 
|  
 | 
|              - FreeSBIE-2.0.1:
 | 
|                  steps = FreeSBIE-2.0.1.steps
 | 
| -                cdrom_cd1 = isos/unix/FreeSBIE-2.0.1-RELEASE.iso
 | 
| -                md5sum_cd1 = b2f680d27c21bbfaf4fb90dce090a118
 | 
| -                md5sum_1m_cd1 = 4d81ee7fe0101b0a14225963bfff60c1
 | 
| +                cdrom_cd1 = unix/FreeSBIE-2.0.1-RELEASE.iso
 | 
| +                md5sum = b2f680d27c21bbfaf4fb90dce090a118
 | 
| +                md5sum_1m = 4d81ee7fe0101b0a14225963bfff60c1
 | 
|  
 | 
|              - memtest:
 | 
|                  mem = 128
 | 
|                  steps = memtest86+.steps
 | 
| -                cdrom_cd1 = isos/misc/memtest86+-2.01.iso
 | 
| -                md5sum_cd1 = 9fae22f2666369968a76ef59e9a81ced
 | 
| -
 | 
| -
 | 
| -whql.support_vm_install|whql.client_install.support_vm:
 | 
| -    image_name += -supportvm
 | 
| +                cdrom_cd1 = misc/memtest86+-2.01.iso
 | 
| +                md5sum = 9fae22f2666369968a76ef59e9a81ced
 | 
|  
 | 
|  
 | 
|  variants:
 | 
| @@ -2317,11 +1923,9 @@ variants:
 | 
|  
 | 
|  
 | 
|  virtio_net|virtio_blk|e1000|balloon_check:
 | 
| -    only Fedora.11 Fedora.12 Fedora.13 Fedora.14 RHEL.5 RHEL.6 OpenSUSE.11 SLES.11 Ubuntu-8.10-server
 | 
| -    # only WinXP Win2003 Win2008 WinVista Win7 Fedora.11 Fedora.12 Fedora.13 Fedora.14 RHEL.5 RHEL.6 OpenSUSE.11 SLES.11 Ubuntu-8.10-server
 | 
| +    only Fedora.11 Fedora.12 Fedora.13 RHEL.5 OpenSUSE.11 SLES.11 Ubuntu-8.10-server
 | 
| +    # only WinXP Win2003 Win2008 WinVista Win7 Fedora.11 Fedora.12 Fedora.13 RHEL.5 OpenSUSE.11 SLES.11 Ubuntu-8.10-server
 | 
|  
 | 
| -kdump:
 | 
| -    only RHEL.5 RHEL.6
 | 
|  
 | 
|  variants:
 | 
|      - @qcow2:
 | 
| 
 |