From patchwork Mon Dec 27 16:01:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 434441 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBRKCV9a025997 for ; Mon, 27 Dec 2010 20:16:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754373Ab0L0QCZ (ORCPT ); Mon, 27 Dec 2010 11:02:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54809 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754348Ab0L0QCY (ORCPT ); Mon, 27 Dec 2010 11:02:24 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG2NSl003919 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Dec 2010 11:02:23 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG2NTL031801; Mon, 27 Dec 2010 11:02:23 -0500 Received: from moof.tlv.redhat.com (dhcp-1-185.tlv.redhat.com [10.35.1.185]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id oBRG1rG2017175; Mon, 27 Dec 2010 11:02:21 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 14/28] KVM test: fix md5sum verification of ISO files Date: Mon, 27 Dec 2010 18:01:41 +0200 Message-Id: <1293465715-16599-14-git-send-email-mgoldish@redhat.com> In-Reply-To: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> References: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Dec 2010 20:16:55 +0000 (UTC) diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index b80d2c2..a8bee6c 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -551,38 +551,40 @@ class VM: params = self.params root_dir = self.root_dir - # Verify the md5sum of the ISO image - iso = params.get("cdrom") - if iso: - iso = kvm_utils.get_path(root_dir, iso) - if not os.path.exists(iso): - logging.error("ISO file not found: %s" % iso) - return False - compare = False - if params.get("md5sum_1m"): - logging.debug("Comparing expected MD5 sum with MD5 sum of " - "first MB of ISO file...") - actual_hash = utils.hash_file(iso, 1048576, method="md5") - expected_hash = params.get("md5sum_1m") - compare = True - elif params.get("md5sum"): - logging.debug("Comparing expected MD5 sum with MD5 sum of ISO " - "file...") - actual_hash = utils.hash_file(iso, method="md5") - expected_hash = params.get("md5sum") - compare = True - elif params.get("sha1sum"): - logging.debug("Comparing expected SHA1 sum with SHA1 sum of " - "ISO file...") - actual_hash = utils.hash_file(iso, method="sha1") - expected_hash = params.get("sha1sum") - compare = True - if compare: - if actual_hash == expected_hash: - logging.debug("Hashes match") - else: - logging.error("Actual hash differs from expected one") + # Verify the md5sum of the ISO images + for cdrom in kvm_utils.get_sub_dict_names(params, "cdroms"): + cdrom_params = kvm_utils.get_sub_dict(params, cdrom) + iso = cdrom_params.get("cdrom") + if iso: + iso = kvm_utils.get_path(root_dir, iso) + if not os.path.exists(iso): + logging.error("ISO file not found: %s" % iso) return False + compare = False + if cdrom_params.get("md5sum_1m"): + logging.debug("Comparing expected MD5 sum with MD5 sum of " + "first MB of ISO file...") + actual_hash = utils.hash_file(iso, 1048576, method="md5") + expected_hash = cdrom_params.get("md5sum_1m") + compare = True + elif cdrom_params.get("md5sum"): + logging.debug("Comparing expected MD5 sum with MD5 sum of " + "ISO file...") + actual_hash = utils.hash_file(iso, method="md5") + expected_hash = cdrom_params.get("md5sum") + compare = True + elif cdrom_params.get("sha1sum"): + logging.debug("Comparing expected SHA1 sum with SHA1 sum " + "of ISO file...") + actual_hash = utils.hash_file(iso, method="sha1") + expected_hash = cdrom_params.get("sha1sum") + compare = True + if compare: + if actual_hash == expected_hash: + logging.debug("Hashes match") + else: + logging.error("Actual hash differs from expected one") + return False # Make sure the following code is not executed by more than one thread # at the same time diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 06cb063..ff02a72 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -830,8 +830,8 @@ variants: install: steps = Fedora-8-i386.steps cdrom_cd1 = isos/linux/Fedora-8-i386-DVD.iso - md5sum = dd6c79fddfff36d409d02242e7b10189 - md5sum_1m = dabae451bb69fbbad0e505b25144b1f9 + md5sum_cd1 = dd6c79fddfff36d409d02242e7b10189 + md5sum_1m_cd1 = dabae451bb69fbbad0e505b25144b1f9 unattended_install: unattended_file = unattended/Fedora-8.ks #floppy = images/f8-32/ks.vfd @@ -840,8 +840,8 @@ variants: initrd = images/f8-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-8-i386-DVD.iso - md5sum = dd6c79fddfff36d409d02242e7b10189 - md5sum_1m = dabae451bb69fbbad0e505b25144b1f9 + md5sum_cd1 = dd6c79fddfff36d409d02242e7b10189 + md5sum_1m_cd1 = dabae451bb69fbbad0e505b25144b1f9 - 8.64: no setup @@ -849,8 +849,8 @@ variants: install: steps = Fedora-8-64.steps cdrom_cd1 = isos/linux/Fedora-8-x86_64-DVD.iso - md5sum = 2cb231a86709dec413425fd2f8bf5295 - md5sum_1m = 145f6414e19492649a56c89f0a45e719 + md5sum_cd1 = 2cb231a86709dec413425fd2f8bf5295 + md5sum_1m_cd1 = 145f6414e19492649a56c89f0a45e719 unattended_install: unattended_file = unattended/Fedora-8.ks #floppy = images/f8-64/ks.vfd @@ -859,16 +859,16 @@ variants: initrd = images/f8-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-8-x86_64-DVD.iso - md5sum = 2cb231a86709dec413425fd2f8bf5295 - md5sum_1m = 145f6414e19492649a56c89f0a45e719 + md5sum_cd1 = 2cb231a86709dec413425fd2f8bf5295 + md5sum_1m_cd1 = 145f6414e19492649a56c89f0a45e719 - 9.32: image_name = f9-32 install: steps = Fedora-9-i386.steps cdrom_cd1 = isos/linux/Fedora-9-i386-DVD.iso - md5sum = 72601f685ea8c808c303353d8bf4d307 - md5sum_1m = f24fa25689e5863f1b99984c6feb787f + md5sum_cd1 = 72601f685ea8c808c303353d8bf4d307 + md5sum_1m_cd1 = f24fa25689e5863f1b99984c6feb787f unattended_install: unattended_file = unattended/Fedora-9.ks #floppy = images/f9-32/ks.vfd @@ -877,8 +877,8 @@ variants: initrd = images/f9-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-9-i386-DVD.iso - md5sum = 72601f685ea8c808c303353d8bf4d307 - md5sum_1m = f24fa25689e5863f1b99984c6feb787f + md5sum_cd1 = 72601f685ea8c808c303353d8bf4d307 + md5sum_1m_cd1 = f24fa25689e5863f1b99984c6feb787f - 9.64: @@ -886,8 +886,8 @@ variants: install: steps = Fedora-9-64.steps cdrom_cd1 = isos/linux/Fedora-9-x86_64-DVD.iso - md5sum = 05b2ebeed273ec54d6f9ed3d61ea4c96 - md5sum_1m = 9822ab5097e37e8fe306ef2192727db4 + md5sum_cd1 = 05b2ebeed273ec54d6f9ed3d61ea4c96 + md5sum_1m_cd1 = 9822ab5097e37e8fe306ef2192727db4 unattended_install: unattended_file = unattended/Fedora-9.ks #floppy = images/f9-64/ks.vfd @@ -896,8 +896,8 @@ variants: initrd = images/f9-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-9-x86_64-DVD.iso - md5sum = 05b2ebeed273ec54d6f9ed3d61ea4c96 - md5sum_1m = 9822ab5097e37e8fe306ef2192727db4 + md5sum_cd1 = 05b2ebeed273ec54d6f9ed3d61ea4c96 + md5sum_1m_cd1 = 9822ab5097e37e8fe306ef2192727db4 - 10.32: @@ -910,8 +910,8 @@ variants: initrd = images/f10-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-10-i386-DVD.iso - md5sum = 27e581edb392728c4a07d00d3fc5ced0 - md5sum_1m = bd67c68bdf595e4ba7131ec702159181 + md5sum_cd1 = 27e581edb392728c4a07d00d3fc5ced0 + md5sum_1m_cd1 = bd67c68bdf595e4ba7131ec702159181 - 10.64: image_name = f10-64 @@ -923,8 +923,8 @@ variants: initrd = images/f10-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-10-x86_64-DVD.iso - sha1sum = f1e5ae7db6a1ba227de7294c4112385922388648 - md5sum_1m = 732857cbf40c80c34683e874601d982c + sha1sum_cd1 = f1e5ae7db6a1ba227de7294c4112385922388648 + md5sum_1m_cd1 = 732857cbf40c80c34683e874601d982c - 11.32: image_name = f11-32 @@ -938,8 +938,8 @@ variants: initrd = images/f11-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-11-i386-DVD.iso - md5sum = e3b1e2d1ba42aa4705fa5f41771b3927 - md5sum_1m = dc8ddf90648c247339c721395aa49714 + md5sum_cd1 = e3b1e2d1ba42aa4705fa5f41771b3927 + md5sum_1m_cd1 = dc8ddf90648c247339c721395aa49714 - 11.64: image_name = f11-64 @@ -951,8 +951,8 @@ variants: initrd = images/f11-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-11-x86_64-DVD.iso - md5sum = 9d419844adeb93120215fe7505c9bce8 - md5sum_1m = 405ee05e2387a2e4328b008d5bcbdd1e + md5sum_cd1 = 9d419844adeb93120215fe7505c9bce8 + md5sum_1m_cd1 = 405ee05e2387a2e4328b008d5bcbdd1e - 12.32: image_name = f12-32 @@ -964,8 +964,8 @@ variants: initrd = images/f12-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-12-i386-DVD.iso - md5sum = 2c4c1c0d09f2fbcfd8ee6a0c5542eeb2 - md5sum_1m = eee935d7f0cf2ef03f6ddce3a2a50050 + md5sum_cd1 = 2c4c1c0d09f2fbcfd8ee6a0c5542eeb2 + md5sum_1m_cd1 = eee935d7f0cf2ef03f6ddce3a2a50050 - 12.64: image_name = f12-64 @@ -977,8 +977,8 @@ variants: initrd = images/f12-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-12-x86_64-DVD.iso - md5sum = 6dd31e292cc2eb1140544e9b1ba61c56 - md5sum_1m = 514efbd7698b55ff6768c8605438bfc5 + md5sum_cd1 = 6dd31e292cc2eb1140544e9b1ba61c56 + md5sum_1m_cd1 = 514efbd7698b55ff6768c8605438bfc5 - 13.32: image_name = f13-32 @@ -990,8 +990,8 @@ variants: initrd = images/f13-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-13-i386-DVD.iso - md5sum = 212fec517c2629b4b5eaf3662ac13136 - md5sum_1m = 4e1578a6ed5a6e7cd03b8fb074030746 + md5sum_cd1 = 212fec517c2629b4b5eaf3662ac13136 + md5sum_1m_cd1 = 4e1578a6ed5a6e7cd03b8fb074030746 - 13.64: image_name = f13-64 @@ -1003,8 +1003,8 @@ variants: initrd = images/f13-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-13-x86_64-DVD.iso - md5sum = 6fbae6379cf27f36e1f2c7827ba7dc35 - md5sum_1m = 68821b9de4d3b5975d6634334e7f47a6 + md5sum_cd1 = 6fbae6379cf27f36e1f2c7827ba7dc35 + md5sum_1m_cd1 = 68821b9de4d3b5975d6634334e7f47a6 - 14.32: image_name = f14-32 @@ -1016,8 +1016,8 @@ variants: initrd = images/f14-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-14-i386-DVD.iso - md5sum = 1cc67641506d2f931d669b8d3528dded - md5sum_1m = d314ab126dabab686111e6a0d71d2e67 + md5sum_cd1 = 1cc67641506d2f931d669b8d3528dded + md5sum_1m_cd1 = d314ab126dabab686111e6a0d71d2e67 - 14.64: image_name = f14-64 @@ -1029,8 +1029,8 @@ variants: initrd = images/f14-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-14-x86_64-DVD.iso - md5sum = f2ebf941dc45f99ee3e8a457c9544552 - md5sum_1m = df029f9cffbc3517937a91124a1e0c3a + md5sum_cd1 = f2ebf941dc45f99ee3e8a457c9544552 + md5sum_1m_cd1 = df029f9cffbc3517937a91124a1e0c3a @@ -1040,16 +1040,16 @@ variants: install: steps = DSL-4.2.5.steps cdrom_cd1 = isos/linux/dsl-4.2.5.iso - md5sum = 61694888aede3e01229865b8e6acd4a1 - md5sum_1m = 527f2481bd25310f2e3a6e5345ff3d12 + md5sum_cd1 = 61694888aede3e01229865b8e6acd4a1 + md5sum_1m_cd1 = 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 = 7e9e183dc11b9d39f480238e4e12bb05 - md5sum_1m = dc7865a75db665efc86d59bca7c1fe07 + md5sum_cd1 = 7e9e183dc11b9d39f480238e4e12bb05 + md5sum_1m_cd1 = dc7865a75db665efc86d59bca7c1fe07 - OpenSUSE: no setup @@ -1067,8 +1067,8 @@ variants: install: steps = openSUSE-11.0-32.steps cdrom_cd1 = isos/linux/openSUSE-11.0-DVD-i386.iso - md5sum = ed6a5b3feb668866df812b1c2aed9d7f - md5sum_1m = c720b30557af758e69de450409516369 + md5sum_cd1 = ed6a5b3feb668866df812b1c2aed9d7f + md5sum_1m_cd1 = c720b30557af758e69de450409516369 unattended_install: unattended_file = unattended/OpenSUSE-11.xml floppy = images/opensuse-11-0-32/autoyast.vfd @@ -1078,8 +1078,8 @@ variants: boot_path = boot/i386/loader unattended_install.cdrom: cdrom_cd1 = isos/linux/openSUSE-11.0-DVD-i386.iso - md5sum = ed6a5b3feb668866df812b1c2aed9d7f - md5sum_1m = c720b30557af758e69de450409516369 + md5sum_cd1 = ed6a5b3feb668866df812b1c2aed9d7f + md5sum_1m_cd1 = c720b30557af758e69de450409516369 - 11.0.64: @@ -1093,16 +1093,16 @@ variants: boot_path = boot/x86_64/loader unattended_install.cdrom: cdrom_cd1 = isos/linux/openSUSE-11.0-DVD-x86_64.iso - md5sum = 512c8346b0f8eb35f28c4eb96454d391 - md5sum_1m = 661aa4cd031df2f25ea0102318a3f4d1 + md5sum_cd1 = 512c8346b0f8eb35f28c4eb96454d391 + md5sum_1m_cd1 = 661aa4cd031df2f25ea0102318a3f4d1 - 11.1.32: image_name = openSUSE-11.1-32 install: - steps=openSUSE-11.1-32-and-64.steps + steps = openSUSE-11.1-32-and-64.steps cdrom_cd1 = isos/linux/openSUSE-11.1-DVD-i586.iso - md5sum = 8f51b278c0415be28c5699e465444bd3 - md5sum_1m = b70217417468389083429f81ba7ce2bd + md5sum_cd1 = 8f51b278c0415be28c5699e465444bd3 + md5sum_1m_cd1 = b70217417468389083429f81ba7ce2bd unattended_install: unattended_file = unattended/OpenSUSE-11.xml floppy = images/opensuse-11-1-32/autoyast.vfd @@ -1112,16 +1112,16 @@ variants: boot_path = boot/i386/loader unattended_install.cdrom: cdrom_cd1 = isos/linux/openSUSE-11.1-DVD-i586.iso - md5sum = 8f51b278c0415be28c5699e465444bd3 - md5sum_1m = b70217417468389083429f81ba7ce2bd + md5sum_cd1 = 8f51b278c0415be28c5699e465444bd3 + md5sum_1m_cd1 = b70217417468389083429f81ba7ce2bd - 11.1.64: image_name = openSUSE-11.1-64 install: steps=openSUSE-11.1-32-and-64.steps cdrom_cd1 = isos/linux/openSUSE-11.1-DVD-x86_64.iso - md5sum = 2afee1b8a87175e6dee2b8dbbd1ad8e8 - md5sum_1m = 768ca32503ef92c28f2d144f2a87e4d0 + md5sum_cd1 = 2afee1b8a87175e6dee2b8dbbd1ad8e8 + md5sum_1m_cd1 = 768ca32503ef92c28f2d144f2a87e4d0 unattended_install: unattended_file = unattended/OpenSUSE-11.xml floppy = images/opensuse-11-1-64/autoyast.vfd @@ -1131,8 +1131,8 @@ variants: boot_path = boot/x86_64/loader unattended_install.cdrom: cdrom_cd1 = isos/linux/openSUSE-11.1-DVD-x86_64.iso - md5sum = 2afee1b8a87175e6dee2b8dbbd1ad8e8 - md5sum_1m = 768ca32503ef92c28f2d144f2a87e4d0 + md5sum_cd1 = 2afee1b8a87175e6dee2b8dbbd1ad8e8 + md5sum_1m_cd1 = 768ca32503ef92c28f2d144f2a87e4d0 - 11.2.32: @@ -1146,8 +1146,8 @@ variants: boot_path = boot/i386/loader unattended_install.cdrom: cdrom_cd1 = isos/linux/openSUSE-11.2-DVD-i586.iso - md5sum = 295d713314a30ad017948f0d542c6d92 - md5sum_1m = 1f8767d00acb492be5a5627c834e543f + md5sum_cd1 = 295d713314a30ad017948f0d542c6d92 + md5sum_1m_cd1 = 1f8767d00acb492be5a5627c834e543f - 11.2.64: @@ -1161,8 +1161,8 @@ variants: boot_path = boot/x86_64/loader unattended_install.cdrom: cdrom_cd1 = isos/linux/openSUSE-11.2-DVD-x86_64.iso - md5sum = 6a09295e34dc030319d040f67f4742c6 - md5sum_1m = 11fd11d39744450b898f04c371dde2e7 + md5sum_cd1 = 6a09295e34dc030319d040f67f4742c6 + md5sum_1m_cd1 = 11fd11d39744450b898f04c371dde2e7 - 11.3.32: image_name = openSUSE-11.3-32 @@ -1175,8 +1175,8 @@ variants: boot_path = boot/i386/loader unattended_install.cdrom: cdrom_cd1 = isos/linux/openSUSE-11.3-DVD-i586.iso - md5sum = 1a1da28c84e3cdad750d5cfa21c4fd17 - md5sum_1m = 4dd26906ce6cb3946519cb0b0de4b0f8 + md5sum_cd1 = 1a1da28c84e3cdad750d5cfa21c4fd17 + md5sum_1m_cd1 = 4dd26906ce6cb3946519cb0b0de4b0f8 - 11.3.64: image_name = openSUSE-11.3-64 @@ -1189,8 +1189,8 @@ variants: boot_path = boot/x86_64/loader unattended_install.cdrom: cdrom_cd1 = isos/linux/openSUSE-11.3-DVD-x86_64.iso - md5sum = adf5d2a0a03c1e3aaf102fd6a4771b87 - md5sum_1m = e0dd12dac30d296417256775e1234c6e + md5sum_cd1 = adf5d2a0a03c1e3aaf102fd6a4771b87 + md5sum_1m_cd1 = e0dd12dac30d296417256775e1234c6e - SLES: shell_prompt = "^root@.*[\#\$]\s*$|#" @@ -1215,15 +1215,15 @@ variants: boot_path = boot/i386/loader unattended_install.cdrom: cdrom_cd1 = isos/linux/SLES-11-DVD-i586-GM-DVD1.iso - md5sum = 4958d4dde2575666355c8a1c5858bab0 - md5sum_1m = 1f19d4eff5bcead2a3e5b8b4212b6796 + md5sum_cd1 = 4958d4dde2575666355c8a1c5858bab0 + md5sum_1m_cd1 = 1f19d4eff5bcead2a3e5b8b4212b6796 - 11.0.64: image_name = sles11-64 cdrom_cd1 = isos/linux/SLES-11-DVD-x86_64-GM-DVD1.iso - md5sum = 50a2bd45cd12c3808c3ee48208e2586b - md5sum_1m = 00000951cab7c32e332362fc424c1054 + md5sum_cd1 = 50a2bd45cd12c3808c3ee48208e2586b + md5sum_1m_cd1 = 00000951cab7c32e332362fc424c1054 unattended_install: unattended_file = unattended/SLES-11.xml floppy = images/sles-11-0-64/autoyast.vfd @@ -1233,8 +1233,8 @@ variants: boot_path = boot/x86_64/loader unattended_install.cdrom: cdrom_cd1 = isos/linux/SLES-11-DVD-x86_64-GM-DVD1.iso - md5sum = 50a2bd45cd12c3808c3ee48208e2586b - md5sum_1m = 00000951cab7c32e332362fc424c1054 + md5sum_cd1 = 50a2bd45cd12c3808c3ee48208e2586b + md5sum_1m_cd1 = 00000951cab7c32e332362fc424c1054 - 11.1.32: @@ -1248,8 +1248,8 @@ variants: boot_path = boot/i386/loader unattended_install.cdrom: cdrom_cd1 = isos/linux/SLES-11-SP1-DVD-i586-GM-DVD1.iso - md5sum = 0dd6886858d93501c38854552b9b1b0d - md5sum_1m = a626a3d50813410e3ac42794e05773bb + md5sum_cd1 = 0dd6886858d93501c38854552b9b1b0d + md5sum_1m_cd1 = a626a3d50813410e3ac42794e05773bb - 11.1.64: image_name = sles11sp1-64 @@ -1262,8 +1262,8 @@ variants: boot_path = boot/x86_64/loader unattended_install.cdrom: cdrom_cd1 = isos/linux/SLES-11-SP1-DVD-x86_64-GM-DVD1.iso - md5sum = d2e10420f3689faa49a004b60fb396b7 - md5sum_1m = f7f67b5da46923a9f01da8a2b6909654 + md5sum_cd1 = d2e10420f3689faa49a004b60fb396b7 + md5sum_1m_cd1 = f7f67b5da46923a9f01da8a2b6909654 - @Ubuntu: @@ -1275,8 +1275,8 @@ variants: image_name = ubuntu-6.10-32 steps = Ubuntu-6.10-32.steps cdrom_cd1 = isos/linux/ubuntu-6.10-desktop-i386.iso - md5sum = 17fb825641571ce5888a718329efd016 - md5sum_1m = 7531d0a84e7451d17c5d976f1c3f8509 + md5sum_cd1 = 17fb825641571ce5888a718329efd016 + md5sum_1m_cd1 = 7531d0a84e7451d17c5d976f1c3f8509 - Ubuntu-8.04-32: skip = yes @@ -1292,8 +1292,8 @@ variants: install: steps = Ubuntu-8.10-server-32.steps cdrom_cd1 = isos/linux/ubuntu-8.10-server-i386.iso - md5sum = a2ec9975a91e1228c8292ed9799dc302 - md5sum_1m = ea493eb8ef7722ead693492fd9f8a13f + md5sum_cd1 = a2ec9975a91e1228c8292ed9799dc302 + md5sum_1m_cd1 = ea493eb8ef7722ead693492fd9f8a13f setup: steps = Ubuntu-8.10-server-32-gcc.steps @@ -1319,8 +1319,8 @@ variants: install: steps=RHEL-3.9-i386.steps cdrom_cd1 = isos/linux/RHEL-3.9-i386-DVD.iso - md5sum = ddd11a1cb104119039b0fa05df6d52b8 - md5sum_1m = 5f10c9417c7b8372b3456c1b5f3f9ed0 + md5sum_cd1 = ddd11a1cb104119039b0fa05df6d52b8 + md5sum_1m_cd1 = 5f10c9417c7b8372b3456c1b5f3f9ed0 unattended_install: unattended_file = unattended/RHEL-3-series.ks #floppy = images/rhel39-32/ks.vfd @@ -1329,8 +1329,8 @@ variants: initrd = images/rhel39-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-3.9-i386-DVD.iso - md5sum = ddd11a1cb104119039b0fa05df6d52b8 - md5sum_1m = 5f10c9417c7b8372b3456c1b5f3f9ed0 + md5sum_cd1 = ddd11a1cb104119039b0fa05df6d52b8 + md5sum_1m_cd1 = 5f10c9417c7b8372b3456c1b5f3f9ed0 - 3.9.x86_64: no setup autotest linux_s3 guest_s4 shutdown @@ -1339,8 +1339,8 @@ variants: install: steps=RHEL-3.9-x86_64.steps cdrom_cd1 = isos/linux/RHEL-3.9-x86_64-DVD.iso - md5sum = bf4635e4a4bd3b43838e72bc8c329d55 - md5sum_1m = 18ecd37b639109f1b2af05cfb57dfeaf + md5sum_cd1 = bf4635e4a4bd3b43838e72bc8c329d55 + md5sum_1m_cd1 = 18ecd37b639109f1b2af05cfb57dfeaf unattended_install: unattended_file = unattended/RHEL-3-series.ks #floppy = images/rhel39-64/ks.vfd @@ -1349,8 +1349,8 @@ variants: initrd = images/rhel39-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-3.9-x86_64-DVD.iso - md5sum = bf4635e4a4bd3b43838e72bc8c329d55 - md5sum_1m = 18ecd37b639109f1b2af05cfb57dfeaf + md5sum_cd1 = bf4635e4a4bd3b43838e72bc8c329d55 + md5sum_1m_cd1 = 18ecd37b639109f1b2af05cfb57dfeaf - 4.7.i386: @@ -1359,8 +1359,8 @@ variants: install: steps = RHEL-4.7-i386.steps cdrom_cd1 = isos/linux/RHEL-4.7-i386-DVD.iso - md5sum = ee5092653732a88ddbaf8eef2484c500 - md5sum_1m = 127081cbed825d7232331a2083975528 + md5sum_cd1 = ee5092653732a88ddbaf8eef2484c500 + md5sum_1m_cd1 = 127081cbed825d7232331a2083975528 unattended_install: unattended_file = unattended/RHEL-4-series.ks #floppy = images/rhel47-32/ks.vfd @@ -1369,8 +1369,8 @@ variants: initrd = images/rhel47-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-4.7-i386-DVD.iso - md5sum = ee5092653732a88ddbaf8eef2484c500 - md5sum_1m = 127081cbed825d7232331a2083975528 + md5sum_cd1 = ee5092653732a88ddbaf8eef2484c500 + md5sum_1m_cd1 = 127081cbed825d7232331a2083975528 - 4.7.x86_64: no setup autotest @@ -1378,8 +1378,8 @@ variants: install: steps = RHEL-4.7-x86_64.steps cdrom_cd1 = isos/linux/RHEL-4.7-x86_64-DVD.iso - md5sum = ea9dae16dd86f7d94092d0e672333292 - md5sum_1m = 58fa63eaee68e269f4cb1d2edf479792 + md5sum_cd1 = ea9dae16dd86f7d94092d0e672333292 + md5sum_1m_cd1 = 58fa63eaee68e269f4cb1d2edf479792 unattended_install: unattended_file = unattended/RHEL-4-series.ks #floppy = images/rhel47-64/ks.vfd @@ -1388,8 +1388,8 @@ variants: initrd = images/rhel47-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-4.7-x86_64-DVD.iso - md5sum = ea9dae16dd86f7d94092d0e672333292 - md5sum_1m = 58fa63eaee68e269f4cb1d2edf479792 + md5sum_cd1 = ea9dae16dd86f7d94092d0e672333292 + md5sum_1m_cd1 = 58fa63eaee68e269f4cb1d2edf479792 - 4.8.i386: no setup autotest @@ -1402,8 +1402,8 @@ variants: initrd = images/rhel48-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-4.8-i386-DVD.iso - md5sum = b024f0af5079539d3ef51f71fed0b194 - md5sum_1m = 969c197402b9058f28a278c1f807d15b + md5sum_cd1 = b024f0af5079539d3ef51f71fed0b194 + md5sum_1m_cd1 = 969c197402b9058f28a278c1f807d15b - 4.8.x86_64: @@ -1417,8 +1417,8 @@ variants: initrd = images/rhel48-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-4.8-x86_64-DVD.iso - md5sum = 696bc877b0200cc942626673fcc3fc09 - md5sum_1m = b11ac0ef7fd345ad712966972db63886 + md5sum_cd1 = 696bc877b0200cc942626673fcc3fc09 + md5sum_1m_cd1 = b11ac0ef7fd345ad712966972db63886 - 5.3.i386: @@ -1427,8 +1427,8 @@ variants: install: steps = RHEL-5.3-i386.steps cdrom_cd1 = isos/linux/RHEL-5.3-i386-DVD.iso - md5sum = 371c62851611fd32ead440df6f24a296 - md5sum_1m = 242318dd44152210f6ff6cdda1bfbf51 + md5sum_cd1 = 371c62851611fd32ead440df6f24a296 + md5sum_1m_cd1 = 242318dd44152210f6ff6cdda1bfbf51 unattended_install: unattended_file = unattended/RHEL-5-series.ks #floppy = images/rhel53-32/ks.vfd @@ -1437,8 +1437,8 @@ variants: initrd = images/rhel53-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-5.3-i386-DVD.iso - md5sum = 371c62851611fd32ead440df6f24a296 - md5sum_1m = 242318dd44152210f6ff6cdda1bfbf51 + md5sum_cd1 = 371c62851611fd32ead440df6f24a296 + md5sum_1m_cd1 = 242318dd44152210f6ff6cdda1bfbf51 - 5.3.x86_64: @@ -1447,8 +1447,8 @@ variants: install: steps=RHEL-5.3-x86_64.steps cdrom_cd1 = isos/linux/RHEL-5.3-x86_64-DVD.iso - md5sum = c5ed6b284410f4d8212cafc78fd7a8c5 - md5sum_1m = b999f437583098ea5bbd56fb1de1d011 + md5sum_cd1 = c5ed6b284410f4d8212cafc78fd7a8c5 + md5sum_1m_cd1 = b999f437583098ea5bbd56fb1de1d011 unattended_install: unattended_file = unattended/RHEL-5-series.ks #floppy = images/rhel53-64/ks.vfd @@ -1457,8 +1457,8 @@ variants: initrd = images/rhel53-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-5.3-x86_64-DVD.iso - md5sum = c5ed6b284410f4d8212cafc78fd7a8c5 - md5sum_1m = b999f437583098ea5bbd56fb1de1d011 + md5sum_cd1 = c5ed6b284410f4d8212cafc78fd7a8c5 + md5sum_1m_cd1 = b999f437583098ea5bbd56fb1de1d011 - 5.4.i386: @@ -1472,8 +1472,8 @@ variants: initrd = images/rhel54-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-5.4-i386-DVD.iso - md5sum = 7a12ec6599527e4f3d1790b51eadbfed - md5sum_1m = 0dbeb8f58d213752d8c029e8601abfbb + md5sum_cd1 = 7a12ec6599527e4f3d1790b51eadbfed + md5sum_1m_cd1 = 0dbeb8f58d213752d8c029e8601abfbb - 5.4.x86_64: @@ -1487,8 +1487,8 @@ variants: initrd = images/rhel54-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-5.4-x86_64-DVD.iso - md5sum = 04fe3c10202402d7b389528d2bad0210 - md5sum_1m = 3e74112003e88a966754849dbb8f5c3f + md5sum_cd1 = 04fe3c10202402d7b389528d2bad0210 + md5sum_1m_cd1 = 3e74112003e88a966754849dbb8f5c3f - 5.5.i386: @@ -1502,8 +1502,8 @@ variants: initrd = images/rhel55-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-5.5-i386-DVD.iso - md5sum = 148858b157f275d9153797efddfc83c3 - md5sum_1m = 2502cc7ddb9d0684fe08c4a83d247902 + md5sum_cd1 = 148858b157f275d9153797efddfc83c3 + md5sum_1m_cd1 = 2502cc7ddb9d0684fe08c4a83d247902 - 5.5.x86_64: @@ -1517,8 +1517,8 @@ variants: initrd = images/rhel55-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-5.5-x86_64-DVD.iso - md5sum = f3119f883257ef9041234feda2f1cad0 - md5sum_1m = a744084a03f6a08627f71527fc107a1e + md5sum_cd1 = f3119f883257ef9041234feda2f1cad0 + md5sum_1m_cd1 = a744084a03f6a08627f71527fc107a1e - 6.0.i386: @@ -1532,8 +1532,8 @@ variants: initrd = images/rhel60-32/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-6.0-i386-DVD.iso - md5sum = 291d234c93442405972689b4b41c14bc - md5sum_1m = ee2cc3d3babe91a1d581a07099c4318b + md5sum_cd1 = 291d234c93442405972689b4b41c14bc + md5sum_1m_cd1 = ee2cc3d3babe91a1d581a07099c4318b - 6.0.x86_64: @@ -1547,8 +1547,8 @@ variants: initrd = images/rhel60-64/initrd.img unattended_install.cdrom: cdrom_cd1 = isos/linux/RHEL-6.0-x86_64-DVD.iso - md5sum = f7141396c6a19399d63e8c195354317d - md5sum_1m = b060eeef63e2c8700db54ae02056e80c + md5sum_cd1 = f7141396c6a19399d63e8c195354317d + md5sum_1m_cd1 = b060eeef63e2c8700db54ae02056e80c @@ -1664,15 +1664,15 @@ variants: install: steps = Win2000-32.steps cdrom_cd1 = isos/windows/Windows2000_sp4.iso - md5sum = dda6039f3a9173f0f6bfae40f5efdfea - md5sum_1m = dd28fba196d366d56fe774bd93df5527 + md5sum_cd1 = dda6039f3a9173f0f6bfae40f5efdfea + md5sum_1m_cd1 = dd28fba196d366d56fe774bd93df5527 user = user setup: steps = Win2000-32-rss.steps unattended_install.cdrom: cdrom_cd1 = isos/windows/Windows2000_sp4.iso - md5sum = dda6039f3a9173f0f6bfae40f5efdfea - md5sum_1m = dd28fba196d366d56fe774bd93df5527 + md5sum_cd1 = dda6039f3a9173f0f6bfae40f5efdfea + md5sum_1m_cd1 = dd28fba196d366d56fe774bd93df5527 unattended_file = unattended/win2000-32.sif floppy = images/win2000-32/answer.vfd @@ -1683,16 +1683,16 @@ variants: image_name += -32 install: cdrom_cd1 = isos/windows/WindowsXP-sp2-vlk.iso - md5sum = 743450644b1d9fe97b3cf379e22dceb0 - md5sum_1m = b473bf75af2d1269fec8958cf0202bfd + md5sum_cd1 = 743450644b1d9fe97b3cf379e22dceb0 + md5sum_1m_cd1 = b473bf75af2d1269fec8958cf0202bfd user = user steps = WinXP-32.steps setup: steps = WinXP-32-rss.steps unattended_install.cdrom: cdrom_cd1 = isos/windows/WindowsXP-sp2-vlk.iso - md5sum = 743450644b1d9fe97b3cf379e22dceb0 - md5sum_1m = b473bf75af2d1269fec8958cf0202bfd + md5sum_cd1 = 743450644b1d9fe97b3cf379e22dceb0 + md5sum_1m_cd1 = b473bf75af2d1269fec8958cf0202bfd unattended_file = unattended/winxp32.sif floppy = images/winXP-32/answer.vfd # Uncomment virtio_network_installer_path line if @@ -1713,16 +1713,16 @@ variants: image_name += -64 install: cdrom_cd1 = isos/windows/WindowsXP-64.iso - md5sum = 8d3f007ec9c2060cec8a50ee7d7dc512 - md5sum_1m = e812363ff427effc512b7801ee70e513 + md5sum_cd1 = 8d3f007ec9c2060cec8a50ee7d7dc512 + md5sum_1m_cd1 = e812363ff427effc512b7801ee70e513 user = user steps = WinXP-64.steps setup: steps = WinXP-64-rss.steps unattended_install.cdrom: cdrom_cd1 = isos/windows/WindowsXP-64.iso - md5sum = 8d3f007ec9c2060cec8a50ee7d7dc512 - md5sum_1m = e812363ff427effc512b7801ee70e513 + md5sum_cd1 = 8d3f007ec9c2060cec8a50ee7d7dc512 + md5sum_1m_cd1 = e812363ff427effc512b7801ee70e513 unattended_file = unattended/winxp64.sif floppy = images/winXP-64/answer.vfd # Uncomment virtio_network_installer_path line if @@ -1748,16 +1748,16 @@ variants: image_name += -32 install: cdrom_cd1 = isos/windows/Windows2003_r2_VLK.iso - md5sum = 03e921e9b4214773c21a39f5c3f42ef7 - md5sum_1m = 37c2fdec15ac4ec16aa10fdfdb338aa3 + md5sum_cd1 = 03e921e9b4214773c21a39f5c3f42ef7 + md5sum_1m_cd1 = 37c2fdec15ac4ec16aa10fdfdb338aa3 user = user steps = Win2003-32.steps setup: steps = Win2003-32-rss.steps unattended_install.cdrom: cdrom_cd1 = isos/windows/Windows2003_r2_VLK.iso - md5sum = 03e921e9b4214773c21a39f5c3f42ef7 - md5sum_1m = 37c2fdec15ac4ec16aa10fdfdb338aa3 + md5sum_cd1 = 03e921e9b4214773c21a39f5c3f42ef7 + md5sum_1m_cd1 = 37c2fdec15ac4ec16aa10fdfdb338aa3 unattended_file = unattended/win2003-32.sif floppy = images/win2003-32/answer.vfd # Uncomment virtio_network_installer_path line if @@ -1777,16 +1777,16 @@ variants: image_name += -64 install: cdrom_cd1 = isos/windows/Windows2003-x64.iso - md5sum = 5703f87c9fd77d28c05ffadd3354dbbd - md5sum_1m = 439393c384116aa09e08a0ad047dcea8 + md5sum_cd1 = 5703f87c9fd77d28c05ffadd3354dbbd + md5sum_1m_cd1 = 439393c384116aa09e08a0ad047dcea8 user = user steps = Win2003-64.steps setup: steps = Win2003-64-rss.steps unattended_install.cdrom: cdrom_cd1 = isos/windows/Windows2003-x64.iso - md5sum = 5703f87c9fd77d28c05ffadd3354dbbd - md5sum_1m = 439393c384116aa09e08a0ad047dcea8 + md5sum_cd1 = 5703f87c9fd77d28c05ffadd3354dbbd + md5sum_1m_cd1 = 439393c384116aa09e08a0ad047dcea8 unattended_file = unattended/win2003-64.sif floppy = images/win2003-64/answer.vfd # Uncomment virtio_network_installer_path line if @@ -1823,15 +1823,15 @@ variants: image_name += -sp1-32 install: cdrom_cd1 = isos/windows/WindowsVista-32.iso - md5sum = 1008f323d5170c8e614e52ccb85c0491 - md5sum_1m = c724e9695da483bc0fd59e426eaefc72 + md5sum_cd1 = 1008f323d5170c8e614e52ccb85c0491 + md5sum_1m_cd1 = c724e9695da483bc0fd59e426eaefc72 steps = Win-Vista-32.steps setup: steps = WinVista-32-rss.steps unattended_install.cdrom: cdrom_cd1 = isos/windows/WindowsVista-32.iso - md5sum = 1008f323d5170c8e614e52ccb85c0491 - md5sum_1m = c724e9695da483bc0fd59e426eaefc72 + md5sum_cd1 = 1008f323d5170c8e614e52ccb85c0491 + md5sum_1m_cd1 = c724e9695da483bc0fd59e426eaefc72 unattended_file = unattended/winvista-32-autounattend.xml floppy = images/winvista-sp1-32/answer.vfd # Uncomment virtio_network_installer_path line if @@ -1845,10 +1845,10 @@ variants: image_name += -sp2-32 unattended_install.cdrom: cdrom_cd1 = isos/windows/en_windows_vista_with_sp2_x86_dvd_342266.iso - md5sum = 19ca90a425667812977bab6f4ce24175 - md5sum_1m = 89c15020e0e6125be19acf7a2e5dc614 - sha1sum = 25ad9a776503e6a583bec07879dbcc5dfd20cd6e - sha1sum_1m = a2afa4cffdc1c362dbf9e62942337f4f875a22cf + md5sum_cd1 = 19ca90a425667812977bab6f4ce24175 + md5sum_1m_cd1 = 89c15020e0e6125be19acf7a2e5dc614 + sha1sum_cd1 = 25ad9a776503e6a583bec07879dbcc5dfd20cd6e + sha1sum_1m_cd1 = a2afa4cffdc1c362dbf9e62942337f4f875a22cf unattended_file = unattended/winvista-32-autounattend.xml floppy = images/winvista-sp2-32/answer.vfd # Uncomment virtio_network_installer_path line if @@ -1869,15 +1869,15 @@ variants: image_name += -sp1-64 install: cdrom_cd1 = isos/windows/WindowsVista-64.iso - md5sum = 11e2010d857fffc47813295e6be6d58d - md5sum_1m = 0947bcd5390546139e25f25217d6f165 + md5sum_cd1 = 11e2010d857fffc47813295e6be6d58d + md5sum_1m_cd1 = 0947bcd5390546139e25f25217d6f165 steps = Win-Vista-64.steps setup: steps = WinVista-64-rss.steps unattended_install.cdrom: cdrom_cd1 = isos/windows/WindowsVista-64.iso - md5sum = 11e2010d857fffc47813295e6be6d58d - md5sum_1m = 0947bcd5390546139e25f25217d6f165 + md5sum_cd1 = 11e2010d857fffc47813295e6be6d58d + md5sum_1m_cd1 = 0947bcd5390546139e25f25217d6f165 unattended_file = unattended/winvista-64-autounattend.xml floppy = images/winvista-sp1-64/answer.vfd # Uncomment virtio_network_installer_path line if @@ -1890,10 +1890,10 @@ variants: image_name += -sp2-64 unattended_install.cdrom: cdrom_cd1 = isos/windows/en_windows_vista_sp2_x64_dvd_342267.iso - md5sum = a1c024d7abaf34bac3368e88efbc2574 - md5sum_1m = 3d84911a80f3df71d1026f7adedc2181 - sha1sum = aaee3c04533899f9f8c4ae0c4250ef5fafbe29a3 - sha1sum_1m = 1fd21bd3ce2a4de8856c7b8fe6fdf80260f6d1c7 + md5sum_cd1 = a1c024d7abaf34bac3368e88efbc2574 + md5sum_1m_cd1 = 3d84911a80f3df71d1026f7adedc2181 + sha1sum_cd1 = aaee3c04533899f9f8c4ae0c4250ef5fafbe29a3 + sha1sum_1m_cd1 = 1fd21bd3ce2a4de8856c7b8fe6fdf80260f6d1c7 unattended_file = unattended/winvista-64-autounattend.xml floppy = images/winvista-sp2-64/answer.vfd # Uncomment virtio_network_installer_path line if @@ -1918,7 +1918,7 @@ variants: #en_windows_server_2008_datacenter_enterprise_standard_x86_dvd_X14-26710.iso md5sum=0bfca49f0164de0a8eba236ced47007d md5sum_1m=07d7f5006393f74dc76e6e2e943e2440 - sha1sum = 6ca018ff96f1e9b2b310a36546b6fded99a421e6 + sha1sum_cd1 = 6ca018ff96f1e9b2b310a36546b6fded99a421e6 steps = Win2008-32.steps setup: steps = Win2008-32-rss.steps @@ -1939,10 +1939,10 @@ variants: image_name += -sp2-32 unattended_install.cdrom: cdrom_cd1 = isos/windows/en_windows_server_2008_datacenter_enterprise_standard_sp2_x86_dvd_342333.iso - md5sum = b9201aeb6eef04a3c573d036a8780bdf - md5sum_1m = b7a9d42e55ea1e85105a3a6ad4da8e04 - sha1sum = 49d0d6917c1256fe81048d414fa473bbc76a8724 - sha1sum_1m = 9662ff7ed715faa00407e4befc484ea52a92a9fb + md5sum_cd1 = b9201aeb6eef04a3c573d036a8780bdf + md5sum_1m_cd1 = b7a9d42e55ea1e85105a3a6ad4da8e04 + sha1sum_cd1 = 49d0d6917c1256fe81048d414fa473bbc76a8724 + sha1sum_1m_cd1 = 9662ff7ed715faa00407e4befc484ea52a92a9fb unattended_file = unattended/win2008-32-autounattend.xml floppy = images/win2008-sp2-32/answer.vfd # Uncomment virtio_network_installer_path line if @@ -1962,7 +1962,7 @@ variants: #en_windows_server_2008_datacenter_enterprise_standard_x64_dvd_X14-26714.iso md5sum=27c58cdb3d620f28c36333a5552f271c md5sum_1m=efdcc11d485a1ef9afa739cb8e0ca766 - sha1sum = bd000374709f67e9358814db6ec8f0ddaaa16f70 + sha1sum_cd1 = bd000374709f67e9358814db6ec8f0ddaaa16f70 passwd = 1q2w3eP setup: steps = Win2008-64-rss.steps @@ -1983,10 +1983,10 @@ variants: image_name += -sp2-64 unattended_install.cdrom: cdrom_cd1 = isos/windows/en_windows_server_2008_datacenter_enterprise_standard_sp2_x64_dvd_342336.iso - md5sum = e94943ef484035b3288d8db69599a6b5 - md5sum_1m = ee55506823d0efffb5532ddd88a8e47b - sha1sum = 34c7d726c57b0f8b19ba3b40d1b4044c15fc2029 - sha1sum_1m = 8fe08b03e3531906855a60a78020ac9577dff5ba + md5sum_cd1 = e94943ef484035b3288d8db69599a6b5 + md5sum_1m_cd1 = ee55506823d0efffb5532ddd88a8e47b + sha1sum_cd1 = 34c7d726c57b0f8b19ba3b40d1b4044c15fc2029 + sha1sum_1m_cd1 = 8fe08b03e3531906855a60a78020ac9577dff5ba unattended_file = unattended/win2008-64-autounattend.xml floppy = images/win2008-sp2-64/answer.vfd # Uncomment virtio_network_installer_path line if @@ -2000,10 +2000,10 @@ variants: image_name += -r2-64 unattended_install.cdrom: cdrom_cd1 = isos/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 + md5sum_cd1 = 0207ef392c60efdda92071b0559ca0f9 + md5sum_1m_cd1 = a5a22ce25008bd7109f6d830d627e3ed + sha1sum_cd1 = ad855ea913aaec3f1d0e1833c1aef7a0de326b0a + sha1sum_1m_cd1 = 9194a3aabae25b36e5f73cad001314b2c8d07d14 unattended_file = unattended/win2008-r2-autounattend.xml floppy = images/win2008-r2-64/answer.vfd # Uncomment virtio_network_installer_path line if @@ -2028,10 +2028,10 @@ variants: image_name += -32 unattended_install.cdrom: cdrom_cd1 = isos/windows/en_windows_7_ultimate_x86_dvd_x15-65921.iso - md5sum = d0b8b407e8a3d4b75ee9c10147266b89 - md5sum_1m = 2b0c2c22b1ae95065db08686bf83af93 - sha1sum = 5395dc4b38f7bdb1e005ff414deedfdb16dbf610 - sha1sum_1m = 9f9c3780aebeb28a9bf22188eed6bc15475dc9c5 + md5sum_cd1 = d0b8b407e8a3d4b75ee9c10147266b89 + md5sum_1m_cd1 = 2b0c2c22b1ae95065db08686bf83af93 + sha1sum_cd1 = 5395dc4b38f7bdb1e005ff414deedfdb16dbf610 + sha1sum_1m_cd1 = 9f9c3780aebeb28a9bf22188eed6bc15475dc9c5 unattended_file = unattended/win7-32-autounattend.xml floppy = images/win7-32/answer.vfd # Uncomment virtio_network_installer_path line if @@ -2058,10 +2058,10 @@ variants: steps = Win7-64-rss.steps unattended_install.cdrom: cdrom_cd1 = isos/windows/en_windows_7_ultimate_x64_dvd_x15-65922.iso - md5sum = f43d22e4fb07bf617d573acd8785c028 - md5sum_1m = b44d8cf99dbed2a5cb02765db8dfd48f - sha1sum = 326327cc2ff9f05379f5058c41be6bc5e004baa7 - sha1sum_1m = 4a3903bd5157de54f0702e5263e0a683c5775515 + md5sum_cd1 = f43d22e4fb07bf617d573acd8785c028 + md5sum_1m_cd1 = b44d8cf99dbed2a5cb02765db8dfd48f + sha1sum_cd1 = 326327cc2ff9f05379f5058c41be6bc5e004baa7 + sha1sum_1m_cd1 = 4a3903bd5157de54f0702e5263e0a683c5775515 unattended_file = unattended/win7-64-autounattend.xml floppy = images/win7-64/answer.vfd # Uncomment virtio_network_installer_path line if @@ -2097,8 +2097,8 @@ variants: image_name = OpenBSD-4.1 steps = OpenBSD-4.1-32.steps cdrom_cd1 = isos/unix/openbsd41-i386-07-05-06.iso - md5sum = 984790db10ebdd6fc7a9cf97abc7c967 - md5sum_1m = 8fc234b4b0ecfe56843a32ac1d26ed55 + md5sum_cd1 = 984790db10ebdd6fc7a9cf97abc7c967 + md5sum_1m_cd1 = 8fc234b4b0ecfe56843a32ac1d26ed55 # Live CD section - @livecd: @@ -2111,26 +2111,26 @@ variants: - Belenix: steps = Belenix-0.7.1.steps cdrom_cd1 = isos/unix/belenix_0.7.1.iso - md5sum = 29cea6160cf5250de138e2820e53e342 - md5sum_1m = 427bbef1b85d6d051799b825d686ae94 + md5sum_cd1 = 29cea6160cf5250de138e2820e53e342 + md5sum_1m_cd1 = 427bbef1b85d6d051799b825d686ae94 - Slax: steps = Slax-6.0.7.steps cdrom_cd1 = isos/linux/slax-6.0.7.iso - md5sum = cde0ecba3c8289d786e12c44666ded6e - md5sum_1m = ddf02bc7444f22d1160a6e5a8fc8723f + md5sum_cd1 = cde0ecba3c8289d786e12c44666ded6e + md5sum_1m_cd1 = ddf02bc7444f22d1160a6e5a8fc8723f - FreeSBIE-2.0.1: steps = FreeSBIE-2.0.1.steps cdrom_cd1 = isos/unix/FreeSBIE-2.0.1-RELEASE.iso - md5sum = b2f680d27c21bbfaf4fb90dce090a118 - md5sum_1m = 4d81ee7fe0101b0a14225963bfff60c1 + md5sum_cd1 = b2f680d27c21bbfaf4fb90dce090a118 + md5sum_1m_cd1 = 4d81ee7fe0101b0a14225963bfff60c1 - memtest: mem = 128 steps = memtest86+.steps cdrom_cd1 = isos/misc/memtest86+-2.01.iso - md5sum = 9fae22f2666369968a76ef59e9a81ced + md5sum_cd1 = 9fae22f2666369968a76ef59e9a81ced variants: