Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Fri Apr 15 10:12:51 CEST 2011. -------- --- kiwi/kiwi.changes 2011-04-13 18:23:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-04-14 17:54:54.000000000 +0200 @@ -1,0 +2,60 @@ +Thu Apr 14 17:42:53 CEST 2011 - ms@suse.de + +- merge in relevant changes from x86 boot image descriptions + into the ppc and s390 boot images + +------------------------------------------------------------------- +Thu Apr 14 17:40:04 CEST 2011 - ms@suse.de + +- fixed build + +------------------------------------------------------------------- +Thu Apr 14 16:00:52 CEST 2011 - ms@suse.de + +- fixed boot partition id in suse-repart if syslinux is + used as bootloader. We are using fat32 now (c) + +------------------------------------------------------------------- +Thu Apr 14 15:55:52 CEST 2011 - ms@suse.de + +- using sfdisk --id now, thus require sfdisk in spec file + +------------------------------------------------------------------- +Thu Apr 14 15:52:16 CEST 2011 - ms@suse.de + +- fixed getStorageID function and the evaluation of the return + value of this function. The assumption that the partition id + is a decimal value is wrong, thus calling int() on the result + is not a good idea. man I really shouldn't code at midnight + +------------------------------------------------------------------- +Thu Apr 14 12:32:44 CEST 2011 - ms@suse.de + +- fixed setupSUSEInitrd function. We create imho poinless + links named linux.vmx and initrd.vmx which are not used + at all if the initrd could be generated by mkinitrd. + Additionally the links are broken if the running kernel + is not the same as the installed kernel. Therefore I + removed the creation of that link files + +- fixed kernelList function. the code searching for installed + kernels if the running kernel can't be found was never + reached. Additionally the function did not search for other + than the running kernel which seems to be wrong if multiple + kernels are installed + +------------------------------------------------------------------- +Thu Apr 14 09:53:38 CEST 2011 - ms@suse.de + +- update config.sh scripts for the ec2 examples to ensure + the ssh policy and inittab console settings are correct + +------------------------------------------------------------------- +Thu Apr 14 09:50:43 CEST 2011 - ms@suse.de + +- added new consistency check to enforce that ec2 formatted images are + created as file system types. This required an update to a number of + other config files used for Validator unit testing. Added new unit + tests for the EC2 requirement. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.lMEvhe/_old 2011-04-15 10:11:41.000000000 +0200 +++ /var/tmp/diff_new_pack.lMEvhe/_new 2011-04-15 10:11:41.000000000 +0200 @@ -51,7 +51,7 @@ Requires: perl = %{perl_version} Requires: perl-XML-LibXML perl-libwww-perl screen coreutils Requires: perl-XML-LibXML-Common perl-XML-SAX perl-Config-IniFiles -Requires: kiwi-tools libxslt checkmedia +Requires: kiwi-tools libxslt checkmedia util-linux %if %{suse_version} > 1030 Requires: satsolver-tools %endif @@ -66,7 +66,7 @@ %endif Summary: OpenSuSE - KIWI Image System Version: 4.85 -Release: 1 +Release: 3 Group: System/Management License: GPLv2 Source: %{name}.tar.bz2 ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-04-11 17:15:54.000000000 +0200 +++ new/kiwi/.revision 2011-04-11 17:15:54.000000000 +0200 @@ -1 +1 @@ -820f348fb2c64c732d9a93d2651b191568597000 +012713629ac2892343ce3ae8d533bb9710c421a1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2011-04-11 17:15:55.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2011-04-14 17:14:27.000000000 +0200 @@ -1818,7 +1818,7 @@ if ($bootloader =~ /(sys|ext)linux/) { my $partid = "c"; if ($bootloader eq "extlinux" ) { - $partid = 83; + $partid = "83"; } my $syslsize = $this->{vmmbyte} - $syslbootMB - $syszip; @commands = ( @@ -1856,7 +1856,7 @@ if ($bootloader =~ /(sys|ext)linux/) { my $partid = "c"; if ($bootloader eq "extlinux" ) { - $partid = 83; + $partid = "83"; } my $syslsize = $this->{vmmbyte} - $syslbootMB; @commands = ( @@ -1883,7 +1883,7 @@ if ($bootloader =~ /(sys|ext)linux/) { my $partid = "c"; if ($bootloader eq "extlinux" ) { - $partid = 83; + $partid = "83"; } my $lvmsize = $this->{vmmbyte} - $syslbootMB; my $bootpartsize = "+".$syslbootMB."M"; @@ -4417,46 +4417,14 @@ # partition. If the call fails the function # returns 0 # --- - my $this = shift; - my $pdev = shift; - my $tool = $this->{ptool}; - my $result; - my $status; - if (! defined $tool) { - $tool = "parted"; - } - SWITCH: for ($tool) { - #========================================== - # parted - #------------------------------------------ - /^parted/ && do { - my $parted = "/usr/sbin/parted -m "; - my $disk = $pdev; - if ($pdev =~ /mapper/) { - if ($pdev =~ /mapper/(.*)p(\d+)/) { - $disk = "/dev/".$1; - $pdev = "/dev/".$1.$2; - } - } else { - if ($pdev =~ /(.*)(\d+)/) { - $disk = $1; - } - } - $parted .= '-s '.$disk.' print |'; - $parted .= 'sed -e "s@^([0-4]):@'.$disk.'\1:@" |'; - $parted .= 'grep ^'.$pdev.':|cut -f2 -d= | cut -f1 -d,'; - $status = qxx ($parted); - $result = $? >> 8; - if ((! $status) && ($pdev =~ /loop/)) { - $status = qxx ("/usr/sbin/parted -s $pdev mklabel msdos 2>&1"); - $status = qxx ($parted); - $result = $? >> 8; - } - last SWITCH; - }; - } + my $this = shift; + my $device = shift; + my $partid = shift; + my $status = qxx ("sfdisk --id $device $partid 2>&1"); + my $result = $? >> 8; if ($result == 0) { - return int $status; + chomp $status; + return $status; } return 0; } @@ -4501,7 +4469,7 @@ } if ($loader eq "lilo") { for (my $i=1;$i<=2;$i++) { - my $type = $this -> getStorageID ($device.$i); + my $type = $this -> getStorageID ($device,$i); if ($type = $search) { $result{prep} = $device.$i; } @@ -4535,11 +4503,11 @@ if ($loader =~ /(sys|ext)linux/) { my $search = "c"; if ($loader eq "extlinux" ) { - $search = 83; + $search = "83"; } for (my $i=3;$i>=1;$i--) { - my $type = $this -> getStorageID ($device.$i); - if ($type == $search) { + my $type = $this -> getStorageID ($device,$i); + if ($type eq $search) { if ($loader eq "syslinux" ) { $result{fat} = $device.$i; } else { @@ -4577,11 +4545,11 @@ if ($loader =~ /(sys|ext)linux/) { my $search = "c"; if ($loader eq "extlinux" ) { - $search = 83; + $search = "83"; } for (my $i=3;$i>=1;$i--) { - my $type = $this -> getStorageID ("/dev/mapper".$dmap."p$i"); - if ($type == $search) { + my $type = $this -> getStorageID ($device,$i); + if ("$type" eq "$search") { if ($loader eq "syslinux") { $result{fat} = "/dev/mapper".$dmap."p$i"; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2011-04-13 18:18:09.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-04-14 17:14:27.000000000 +0200 @@ -897,13 +897,6 @@ if [ -f /etc/init.d/boot.device-mapper ];then /etc/init.d/boot.device-mapper stop fi - if [ $bootLoaderOK = "1" ] && [ $haveVMX = "1" ];then - running=$(uname -r) - rlinux=vmlinuz-$running - rinitrd=initrd-$running - ln -s $rlinux /boot/linux.vmx - ln -s $rinitrd /boot/initrd.vmx - fi if [ $umountSys -eq 1 ];then umount /sys fi @@ -1583,7 +1576,7 @@ #-------------------------------------- echo "DEFAULT $title" >> $conf echo "label $title" >> $conf - if xenServer $kernel $mountPrefix;then + if xenServer $kname $mountPrefix;then systemException \ "*** $loader: Xen dom0 boot not implemented ***" \ "reboot" @@ -1616,7 +1609,7 @@ #-------------------------------------- title=$(makeLabel "Failsafe -- $title") echo "label $title" >> $conf - if xenServer $kernel $mountPrefix;then + if xenServer $kname $mountPrefix;then systemException \ "*** $loader: Xen dom0 boot not implemented ***" \ "reboot" @@ -3781,23 +3774,23 @@ KERNEL_PAIR=$kernel:$initrd KERNEL_NAME[$kcount]=$krunning KERNEL_LIST=$KERNEL_PAIR + kcount=$((kcount+1)) fi fi #====================================== # search for other kernels #-------------------------------------- - if [ ! -z "$KERNEL_LIST" ];then - for i in $prefix/lib/modules/*;do - if [ ! -d $i ];then - continue - fi - unset kernel - unset initrd - kname=`basename $i` - if [ "$kname" = $krunning ];then - continue - fi - for name in vmlinux vmlinuz image;do + for i in $prefix/lib/modules/*;do + if [ ! -d $i ];then + continue + fi + unset kernel + unset initrd + kname=`basename $i` + if [ "$kname" = $krunning ];then + continue + fi + for name in vmlinux vmlinuz image;do for k in $prefix/boot/$name-${i##*/}; do if [ -f $k ];then kernel=${k##*/} @@ -3805,16 +3798,17 @@ break 2 fi done - done - if [ -z "$kernel" ];then - continue - fi - kcount=$((kcount+1)) + done + if [ ! -z "$kernel" ];then kpair=$kernel:$initrd KERNEL_NAME[$kcount]=$kname KERNEL_LIST=$KERNEL_LIST,$kpair - done - fi + kcount=$((kcount+1)) + fi + done + #====================================== + # what if no kernel was found... + #-------------------------------------- if [ -z "$KERNEL_LIST" ];then # /.../ # the system image doesn't provide the kernel and initrd but @@ -3832,6 +3826,7 @@ KERNEL_NAME[1]=vmlinux fi fi + KERNEL_LIST=$(echo $KERNEL_LIST | sed -e s@^,@@) export KERNEL_LIST export KERNEL_NAME export KERNEL_PAIR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLValidator.pm new/kiwi/modules/KIWIXMLValidator.pm --- old/kiwi/modules/KIWIXMLValidator.pm 2011-04-08 14:27:57.000000000 +0200 +++ new/kiwi/modules/KIWIXMLValidator.pm 2011-04-14 17:14:27.000000000 +0200 @@ -262,6 +262,40 @@ } #========================================== +# __checkEC2IsFsysType +#------------------------------------------ +sub __checkEC2IsFsysType { + # ... + # When building an EC2 image we expect the type to be a file system image. + # --- + my $this = shift; + # TODO: + # Excluding btrfs and xfs, needs testing first. There are potentisl issues + # with both file systems as they require a boot partiotion and our current + # setup for EC2 is to not have a boot partition. + # Excluding clicfs and squashfs, they appear to be impractical for EC2, + # can be enabled if someone complains + my @supportedFSTypes = qw /ext2 ext3 ext4 reiserfs/; + my @typeNodes = $this->{systemTree}->getElementsByTagName('type'); + for my $type (@typeNodes) { + my $format = $type -> getAttribute('format'); + if ($format && $format eq 'ec2') { + my $imgType = $type -> getAttribute('image'); + if (! grep /^$imgType$/, @supportedFSTypes) { + my $kiwi = $this->{kiwi}; + my $msg = 'For EC2 image creation the image type must be ' + . 'one of the following supported file systems: ' + . "@supportedFSTypes"; + $kiwi -> error ( $msg ); + $kiwi -> failed (); + return undef; + } + } + } + return 1; +} + +#========================================== # __checkEC2Regions #------------------------------------------ sub __checkEC2Regions { @@ -842,6 +876,9 @@ if (! $this -> __checkDisplaynameValid()) { return undef; } + if (! $this -> __checkEC2IsFsysType()) { + return undef; + } if (! $this -> __checkEC2Regions()) { return undef; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-repart new/kiwi/system/boot/ix86/oemboot/suse-repart --- old/kiwi/system/boot/ix86/oemboot/suse-repart 2011-03-31 11:49:12.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-repart 2011-04-14 17:14:27.000000000 +0200 @@ -732,7 +732,7 @@ export bootXMBytes=100 export bootpartID=83 if [ "$loader" = "syslinux" ];then - bootpartID=6 + bootpartID=c fi #====================================== # Store contents in RAM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-linuxrc new/kiwi/system/boot/ppc/oemboot/suse-linuxrc --- old/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2011-03-21 16:02:02.000000000 +0100 +++ new/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2011-04-14 17:46:06.000000000 +0200 @@ -69,6 +69,9 @@ # Set default filesystem device names #-------------------------------------- export imageRWDevice=$(ddn $imageDiskDevice 3) + if [ ! -z "$kiwi_ramonly" ];then + export imageRWDevice=/dev/ram1 + fi export imageRODevice=$(ddn $imageDiskDevice 2) export imageIOWRDevice=$imageRWDevice #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-dump new/kiwi/system/boot/s390/oemboot/suse-dump --- old/kiwi/system/boot/s390/oemboot/suse-dump 2011-03-11 15:36:06.000000000 +0100 +++ new/kiwi/system/boot/s390/oemboot/suse-dump 2011-04-14 17:46:06.000000000 +0200 @@ -52,7 +52,7 @@ #====================================== # find TFTP server from lease file #-------------------------------------- - checkServer + pxeCheckServer if [ -z $SERVER ];then SERVER=tftp.$DOMAIN fi @@ -268,6 +268,9 @@ fi imageName=$prefix/$imageName imageMD5=$(echo $imageName | sed -e s@.raw@.md5@) + if [ ! -z "$pxe" ];then + imageName=$(echo $imageName | sed -e s@.raw@.gz@) + fi OEMRootImage=$imageName #====================================== # Search, ask for the install partition @@ -672,7 +675,7 @@ else multicast="disable" Echo "Loading $Source [$Target BS:$imageBlkSize Byte]..." - fetchFile $Source $Target uncompressed $imageServer + fetchFile $Source $Target compressed $imageServer if test $loadCode != 0 || ! loadOK "$loadStatus";then systemException \ "Download of $imageName failed: $loadStatus" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-linuxrc new/kiwi/system/boot/s390/oemboot/suse-linuxrc --- old/kiwi/system/boot/s390/oemboot/suse-linuxrc 2011-03-21 16:02:02.000000000 +0100 +++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2011-04-14 17:46:06.000000000 +0200 @@ -69,6 +69,9 @@ # Set default filesystem device names #-------------------------------------- export imageRWDevice=$(ddn $imageDiskDevice 2) + if [ ! -z "$kiwi_ramonly" ];then + export imageRWDevice=/dev/ram1 + fi export imageRODevice=$(ddn $imageDiskDevice 1) export imageIOWRDevice=$imageRWDevice #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-repart new/kiwi/system/boot/s390/oemboot/suse-repart --- old/kiwi/system/boot/s390/oemboot/suse-repart 2011-03-31 11:49:12.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-repart 2011-04-14 17:46:06.000000000 +0200 @@ -759,7 +759,7 @@ export bootXMBytes=100 export bootpartID=83 if [ "$loader" = "syslinux" ];then - bootpartID=6 + bootpartID=c fi #====================================== # Store contents in RAM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/defaultProfileInvalid_1.xml new/kiwi/tests/unit/data/kiwiXMLValidator/defaultProfileInvalid_1.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/defaultProfileInvalid_1.xml 2011-04-08 14:27:58.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/defaultProfileInvalid_1.xml 2011-04-14 17:14:27.000000000 +0200 @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> - <image schemaversion="5.2" name="suse-11.3-xen-guest"> <description type="system"> - <author>Marcus Schäfer</author> - <contact>ms@novell.com</contact> + <author>Robert Schweikert</author> + <contact>rschweikert@novell.com</contact> <specification>test profiles validation</specification> </description> <profiles> - <profile name="xenFlavour" description="VMX with Xen kernel" import="true"/> - <profile name="ec2Flavour" description="VMX with default kernel" import="true"/> + <profile name="xenFlavor" description="VMX with Xen kernel" import="true"/> + <profile name="vmwFlavor" description="VMX with default kernel" import="true"/> </profiles> <preferences> <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> @@ -25,7 +24,7 @@ <locale>en_US</locale> <keytable>us.map.gz</keytable> </preferences> - <preferences profiles="xenFlavour"> + <preferences profiles="xenFlavor"> <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="xenk"> <machine memory="128" domain="domU"> <vmdisk controller="ide" id="0" device="/dev/xvda"/> @@ -33,17 +32,11 @@ </machine> </type> </preferences> - <preferences profiles="ec2Flavour"> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="ec2" format="ec2"> + <preferences profiles="vmwFlavor"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" format="vmdk"> <machine memory="128" domain="domU"> - <vmdisk controller="ide" id="0" device="/dev/xvda"/> - <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> + <vmdisk controller="ide" id="0"/> </machine> - <ec2config> - <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> - <ec2certfile>Path to EC2 public certificate file</ec2certfile> - <ec2accountnr>12345678911</ec2accountnr> - </ec2config> </type> </preferences> <users group="root"> @@ -57,15 +50,15 @@ <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> <package name="ifplugd"/> <package name="vim"/> - <package name="xen-tools-domU"/> - <package name="xen"/> <opensusePattern name="base"/> </packages> - <packages type="image" profiles="xenFlavour"> - <package name="kernel-xen" replaces="kernel-ec2"/> + <packages type="image" profiles="xenFlavor"> + <package name="kernel-xen" replaces="kernel-default"/> + <package name="xen-tools-domU"/> + <package name="xen"/> </packages> - <packages type="image" profiles="ec2Flavour"> - <package name="kernel-ec2" replaces="kernel-xen"/> + <packages type="image" profiles="vmwFlavor"> + <package name="kernel-default" replaces="kernel-xen"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/defaultProfileValid_1.xml new/kiwi/tests/unit/data/kiwiXMLValidator/defaultProfileValid_1.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/defaultProfileValid_1.xml 2011-04-08 14:27:58.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/defaultProfileValid_1.xml 2011-04-14 17:14:27.000000000 +0200 @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <image schemaversion="5.1" name="suse-11.3-xen-guest"> <description type="system"> - <author>Marcus Schäfer</author> - <contact>ms@novell.com</contact> + <author>Robert Schweikert</author> + <contact>rschweikert@novell.com</contact> <specification>test profiles validation</specification> </description> <profiles> - <profile name="xenFlavour" description="VMX with Xen kernel" import="true"/> - <profile name="ec2Flavour" description="VMX with default kernel"/> + <profile name="xenFlavor" description="VMX with Xen kernel" import="true"/> + <profile name="vmwFlavor" description="VMX with default kernel"/> </profiles> <preferences> - <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> + <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> <version>1.1.2</version> <packagemanager>zypper</packagemanager> <rpm-check-signatures>false</rpm-check-signatures> @@ -24,7 +24,7 @@ <locale>en_US</locale> <keytable>us.map.gz</keytable> </preferences> - <preferences profiles="xenFlavour"> + <preferences profiles="xenFlavor"> <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="xenk"> <machine memory="128" domain="domU"> <vmdisk controller="ide" id="0" device="/dev/xvda"/> @@ -32,17 +32,11 @@ </machine> </type> </preferences> - <preferences profiles="ec2Flavour"> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="ec2" format="ec2"> + <preferences profiles="vmwFlavor"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" format="vmdk"> <machine memory="128" domain="domU"> - <vmdisk controller="ide" id="0" device="/dev/xvda"/> - <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> + <vmdisk controller="ide" id="0"/> </machine> - <ec2config> - <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> - <ec2certfile>Path to EC2 public certificate file</ec2certfile> - <ec2accountnr>12345678911</ec2accountnr> - </ec2config> </type> </preferences> @@ -57,15 +51,15 @@ <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> <package name="ifplugd"/> <package name="vim"/> - <package name="xen-tools-domU"/> - <package name="xen"/> <opensusePattern name="base"/> </packages> - <packages type="image" profiles="xenFlavour"> - <package name="kernel-xen" replaces="kernel-ec2"/> + <packages type="image" profiles="xenFlavor"> + <package name="kernel-xen" replaces="kernel-default"/> + <package name="xen-tools-domU"/> + <package name="xen"/> </packages> - <packages type="image" profiles="ec2Flavour"> - <package name="kernel-ec2" replaces="kernel-xen"/> + <packages type="image" profiles="vmwFlavor"> + <package name="kernel-default" replaces="kernel-xen"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/defaultProfileValid_3.xml new/kiwi/tests/unit/data/kiwiXMLValidator/defaultProfileValid_3.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/defaultProfileValid_3.xml 2011-04-08 14:27:58.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/defaultProfileValid_3.xml 2011-04-14 17:14:27.000000000 +0200 @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <image schemaversion="5.1" name="suse-11.3-xen-guest"> <description type="system"> - <author>Marcus Schäfer</author> - <contact>ms@novell.com</contact> + <author>Robert Schweikert</author> + <contact>rschweikert@novell.com</contact> <specification>test profiles validation</specification> </description> <profiles> - <profile name="xenFlavour" description="VMX with Xen kernel" import="true"/> - <profile name="ec2Flavour" description="VMX with default kernel" import="false"/> + <profile name="xenFlavor" description="VMX with Xen kernel" import="true"/> + <profile name="vmwFlavor" description="VMX with default kernel" import="false"/> </profiles> <preferences> - <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> + <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> <version>1.1.2</version> <packagemanager>zypper</packagemanager> <rpm-check-signatures>false</rpm-check-signatures> @@ -24,7 +24,7 @@ <locale>en_US</locale> <keytable>us.map.gz</keytable> </preferences> - <preferences profiles="xenFlavour"> + <preferences profiles="xenFlavor"> <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="xenk"> <machine memory="128" domain="domU"> <vmdisk controller="ide" id="0" device="/dev/xvda"/> @@ -32,17 +32,11 @@ </machine> </type> </preferences> - <preferences profiles="ec2Flavour"> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="ec2" format="ec2"> + <preferences profiles="vmwFlavor"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" format="vmdk"> <machine memory="128" domain="domU"> <vmdisk controller="ide" id="0" device="/dev/xvda"/> - <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> </machine> - <ec2config> - <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> - <ec2certfile>Path to EC2 public certificate file</ec2certfile> - <ec2accountnr>12345678911</ec2accountnr> - </ec2config> </type> </preferences> @@ -57,15 +51,15 @@ <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> <package name="ifplugd"/> <package name="vim"/> - <package name="xen-tools-domU"/> - <package name="xen"/> <opensusePattern name="base"/> </packages> - <packages type="image" profiles="xenFlavour"> - <package name="kernel-xen" replaces="kernel-ec2"/> + <packages type="image" profiles="xenFlavor"> + <package name="kernel-xen" replaces="kernel-default"/> + <package name="xen-tools-domU"/> + <package name="xen"/> </packages> - <packages type="image" profiles="ec2Flavour"> - <package name="kernel-ec2" replaces="kernel-xen"/> + <packages type="image" profiles="vmwFlavor"> + <package name="kernel-default" replaces="kernel-xen"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/defaultTypeInvalid_1.xml new/kiwi/tests/unit/data/kiwiXMLValidator/defaultTypeInvalid_1.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/defaultTypeInvalid_1.xml 2011-04-08 14:27:58.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/defaultTypeInvalid_1.xml 2011-04-14 17:14:27.000000000 +0200 @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <image schemaversion="5.1" name="suse-11.3-xen-guest"> <description type="system"> - <author>Marcus Schäfer</author> - <contact>ms@novell.com</contact> + <author>Robert Schweikert</author> + <contact>rschweikert@novell.com</contact> <specification>test multiple default type per pref section</specification> </description> <profiles> - <profile name="xenFlavour" description="VMX with Xen kernel" import="true"/> - <profile name="ec2Flavour" description="VMX with default kernel"/> + <profile name="xenFlavor" description="VMX with Xen kernel" import="true"/> + <profile name="vmwFlavor" description="VMX with default kernel"/> </profiles> <preferences> - <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> - <type primary="true" image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> + <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> + <type primary="true" image="vmx" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk"/> <version>1.1.2</version> <packagemanager>zypper</packagemanager> <rpm-check-signatures>false</rpm-check-signatures> @@ -25,32 +25,26 @@ <locale>en_US</locale> <keytable>us.map.gz</keytable> </preferences> - <preferences profiles="xenFlavour"> + <preferences profiles="xenFlavor"> <type primary="true" image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="xenk"> <machine memory="128" domain="domU"> <vmdisk controller="ide" id="0" device="/dev/xvda"/> <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> </machine> </type> - <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> + <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> </preferences> - <preferences profiles="ec2Flavour"> - <type primary="true" image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="ec2" format="ec2"> - <machine memory="128" domain="domU"> - <vmdisk controller="ide" id="0" device="/dev/xvda"/> - <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> + <preferences profiles="vmwFlavor"> + <type primary="true" image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" format="vmdk"> + <machine memory="128"> + <vmdisk controller="ide" id="0"/> </machine> - <ec2config> - <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> - <ec2certfile>Path to EC2 public certificate file</ec2certfile> - <ec2accountnr>12345678911</ec2accountnr> - </ec2config> </type> </preferences> @@ -65,15 +59,15 @@ <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> <package name="ifplugd"/> <package name="vim"/> - <package name="xen-tools-domU"/> - <package name="xen"/> <opensusePattern name="base"/> </packages> - <packages type="image" profiles="xenFlavour"> - <package name="kernel-xen" replaces="kernel-ec2"/> + <packages type="image" profiles="xenFlavor"> + <package name="kernel-xen" replaces="kernel-default"/> + <package name="xen-tools-domU"/> + <package name="xen"/> </packages> - <packages type="image" profiles="ec2Flavour"> - <package name="kernel-ec2" replaces="kernel-xen"/> + <packages type="image" profiles="vmwFlavor"> + <package name="kernel-default" replaces="kernel-xen"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/defaultTypeValid_2.xml new/kiwi/tests/unit/data/kiwiXMLValidator/defaultTypeValid_2.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/defaultTypeValid_2.xml 2011-04-08 14:27:58.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/defaultTypeValid_2.xml 2011-04-14 17:14:27.000000000 +0200 @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <image schemaversion="5.1" name="suse-11.3-xen-guest"> <description type="system"> - <author>Marcus Schäfer</author> - <contact>ms@novell.com</contact> + <author>Robert Schweikert</author> + <contact>rschweikert@novell.com</contact> <specification>test one default type per pref section</specification> </description> <profiles> - <profile name="xenFlavour" description="VMX with Xen kernel" import="true"/> - <profile name="ec2Flavour" description="VMX with default kernel"/> + <profile name="xenFlavor" description="VMX with Xen kernel" import="true"/> + <profile name="vmwFlavor" description="VMX with default kernel"/> </profiles> <preferences> - <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> + <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> <version>1.1.2</version> <packagemanager>zypper</packagemanager> <rpm-check-signatures>false</rpm-check-signatures> @@ -24,32 +24,26 @@ <locale>en_US</locale> <keytable>us.map.gz</keytable> </preferences> - <preferences profiles="xenFlavour"> + <preferences profiles="xenFlavor"> <type primary="true" image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="xenk"> <machine memory="128" domain="domU"> <vmdisk controller="ide" id="0" device="/dev/xvda"/> <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> </machine> </type> - <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> + <type image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> </preferences> - <preferences profiles="ec2Flavour"> - <type primary="true" image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="ec2" format="ec2"> - <machine memory="128" domain="domU"> - <vmdisk controller="ide" id="0" device="/dev/xvda"/> - <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> + <preferences profiles="vmwFlavor"> + <type primary="true" image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" format="vmdk"> + <machine memory="128"> + <vmdisk controller="ide" id="0"/> </machine> - <ec2config> - <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> - <ec2certfile>Path to EC2 public certificate file</ec2certfile> - <ec2accountnr>12345678911</ec2accountnr> - </ec2config> </type> </preferences> @@ -64,15 +58,15 @@ <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> <package name="ifplugd"/> <package name="vim"/> - <package name="xen-tools-domU"/> - <package name="xen"/> <opensusePattern name="base"/> </packages> - <packages type="image" profiles="xenFlavour"> - <package name="kernel-xen" replaces="kernel-ec2"/> + <packages type="image" profiles="xenFlavor"> + <package name="kernel-xen" replaces="kernel-default"/> + <package name="xen-tools-domU"/> + <package name="xen"/> </packages> - <packages type="image" profiles="ec2Flavour"> - <package name="kernel-ec2" replaces="kernel-xen"/> + <packages type="image" profiles="vmwFlavor"> + <package name="kernel-default" replaces="kernel-xen"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/defaultTypeValid_3.xml new/kiwi/tests/unit/data/kiwiXMLValidator/defaultTypeValid_3.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/defaultTypeValid_3.xml 2011-04-08 14:27:58.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/defaultTypeValid_3.xml 2011-04-14 17:14:27.000000000 +0200 @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> - <image schemaversion="5.2" name="suse-11.3-xen-guest"> <description type="system"> - <author>Marcus Schäfer</author> - <contact>ms@novell.com</contact> + <author>Robert Schweikert</author> + <contact>rschweikert@novell.com</contact> <specification>test use of default type</specification> </description> <profiles> <profile name="xenFlavour" description="VMX with Xen kernel" import="true"/> - <profile name="ec2Flavour" description="VMX with default kernel"/> + <profile name="vmwFlavor" description="VMX with default kernel"/> </profiles> <preferences> <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> @@ -40,17 +39,11 @@ </oemconfig> </type> </preferences> - <preferences profiles="ec2Flavour"> - <type primary="true" image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="ec2" format="ec2"> - <machine memory="128" domain="domU"> - <vmdisk controller="ide" id="0" device="/dev/xvda"/> - <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> + <preferences profiles="vmwFlavor"> + <type primary="true" image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" format="vmdk"> + <machine memory="128"> + <vmdisk controller="ide" id="0"/> </machine> - <ec2config> - <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> - <ec2certfile>Path to EC2 public certificate file</ec2certfile> - <ec2accountnr>12345678911</ec2accountnr> - </ec2config> </type> </preferences> <users group="root"> @@ -69,10 +62,10 @@ <opensusePattern name="base"/> </packages> <packages type="image" profiles="xenFlavour"> - <package name="kernel-xen" replaces="kernel-ec2"/> + <package name="kernel-xen" replaces="kernel-default"/> </packages> - <packages type="image" profiles="ec2Flavour"> - <package name="kernel-ec2" replaces="kernel-xen"/> + <packages type="image" profiles="vmwFlavor"> + <package name="kernel-default" replaces="kernel-xen"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/ec2IsFSInvalid_1.xml new/kiwi/tests/unit/data/kiwiXMLValidator/ec2IsFSInvalid_1.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/ec2IsFSInvalid_1.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/ec2IsFSInvalid_1.xml 2011-04-14 17:14:27.000000000 +0200 @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.2" name="suse-11.3-ec2-guest"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rschweikert@novell.com</contact> + <specification>test ec2 type specification</specification> + </description> + <preferences> + <version>1.1.2</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + <type image="oem" format="ec2" boot="oemboot/suse-11.4" filesystem="ext3"> + <ec2config> + <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> + <ec2certfile>Path to EC2 public certificate file</ec2certfile> + <ec2accountnr>12345678911</ec2accountnr> + <ec2region>US-West</ec2region> + </ec2config> + </type> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <repository type="rpm-md"> + <source path="opensuse:Virtualization:/Cloud:/EC2/openSUSE_11.3"/> + </repository> + <packages type="image"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="ifplugd"/> + <package name="kernel-ec2"/> + <package name="suse-ami-tools"/> + <package name="vim"/> + <package name="xen-tools-domU"/> + <package name="xen"/> + <opensusePattern name="base"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/ec2IsFSInvalid_2.xml new/kiwi/tests/unit/data/kiwiXMLValidator/ec2IsFSInvalid_2.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/ec2IsFSInvalid_2.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/ec2IsFSInvalid_2.xml 2011-04-14 17:14:27.000000000 +0200 @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.2" name="suse-11.3-ec2-guest"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rschweikert@novell.com</contact> + <specification>test ec2 type specification</specification> + </description> + <preferences> + <version>1.1.2</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + <type image="clicfs" format="ec2"> + <ec2config> + <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> + <ec2certfile>Path to EC2 public certificate file</ec2certfile> + <ec2accountnr>12345678911</ec2accountnr> + <ec2region>US-West</ec2region> + </ec2config> + </type> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <repository type="rpm-md"> + <source path="opensuse:Virtualization:/Cloud:/EC2/openSUSE_11.3"/> + </repository> + <packages type="image"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="ifplugd"/> + <package name="kernel-ec2"/> + <package name="suse-ami-tools"/> + <package name="vim"/> + <package name="xen-tools-domU"/> + <package name="xen"/> + <opensusePattern name="base"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/ec2IsFSValid_1.xml new/kiwi/tests/unit/data/kiwiXMLValidator/ec2IsFSValid_1.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/ec2IsFSValid_1.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/ec2IsFSValid_1.xml 2011-04-14 17:14:27.000000000 +0200 @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.2" name="suse-11.3-ec2-guest"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rschweikert@novell.com</contact> + <specification>test ec2 type specification</specification> + </description> + <preferences> + <version>1.1.2</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + <type image="reiserfs" format="ec2"> + <ec2config> + <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> + <ec2certfile>Path to EC2 public certificate file</ec2certfile> + <ec2accountnr>12345678911</ec2accountnr> + <ec2region>EU-West</ec2region> + <ec2region>US-West</ec2region> + </ec2config> + </type> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://11.3/repo/oss/"/> + </repository> + <repository type="rpm-md"> + <source path="opensuse:Virtualization:/Cloud:/EC2/openSUSE_11.3"/> + </repository> + <packages type="image"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="ifplugd"/> + <package name="kernel-ec2"/> + <package name="suse-ami-tools"/> + <package name="vim"/> + <package name="xen-tools-domU"/> + <package name="xen"/> + <opensusePattern name="base"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + </packages> +</image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/preferenceUniqueInvalid_2.xml new/kiwi/tests/unit/data/kiwiXMLValidator/preferenceUniqueInvalid_2.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/preferenceUniqueInvalid_2.xml 2011-04-08 14:27:58.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/preferenceUniqueInvalid_2.xml 2011-04-14 17:14:27.000000000 +0200 @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <image schemaversion="5.1" name="suse-11.3-xen-guest"> <description type="system"> - <author>Marcus Schäfer</author> - <contact>ms@novell.com</contact> + <author>Robert Schweikert</author> + <contact>rschweikert@novell.com</contact> <specification>test preferences consistency, ref same profile twice</specification> </description> <profiles> - <profile name="xenFlavour" description="VMX with Xen kernel" import="true"/> - <profile name="ec2Flavour" description="VMX with default kernel"/> + <profile name="xenFlavor" description="VMX with Xen kernel" import="true"/> + <profile name="vmwFlavor" description="VMX with default kernel"/> </profiles> <preferences> - <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> + <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> <version>1.1.2</version> <packagemanager>zypper</packagemanager> <rpm-check-signatures>false</rpm-check-signatures> @@ -24,7 +24,7 @@ <locale>en_US</locale> <keytable>us.map.gz</keytable> </preferences> - <preferences profiles="xenFlavour"> + <preferences profiles="xenFlavor"> <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="xenk"> <machine memory="128" domain="domU"> <vmdisk controller="ide" id="0" device="/dev/xvda"/> @@ -32,17 +32,11 @@ </machine> </type> </preferences> - <preferences profiles="xenFlavour"> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="ec2" format="ec2"> + <preferences profiles="xenFlavor"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" format="vmdk"> <machine memory="128" domain="domU"> - <vmdisk controller="ide" id="0" device="/dev/xvda"/> - <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> + <vmdisk controller="ide" id="0"/> </machine> - <ec2config> - <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> - <ec2certfile>Path to EC2 public certificate file</ec2certfile> - <ec2accountnr>12345678911</ec2accountnr> - </ec2config> </type> </preferences> @@ -61,11 +55,13 @@ <package name="xen"/> <opensusePattern name="base"/> </packages> - <packages type="image" profiles="xenFlavour"> - <package name="kernel-xen" replaces="kernel-ec2"/> + <packages type="image" profiles="xenFlavor"> + <package name="kernel-xen" replaces="kernel-default"/> + <package name="xen-tools-domU"/> + <package name="xen"/> </packages> - <packages type="image" profiles="ec2Flavour"> - <package name="kernel-ec2" replaces="kernel-xen"/> + <packages type="image" profiles="vmwFlavor"> + <package name="kernel-default" replaces="kernel-xen"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/preferenceUniqueValid_1.xml new/kiwi/tests/unit/data/kiwiXMLValidator/preferenceUniqueValid_1.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/preferenceUniqueValid_1.xml 2011-04-08 14:27:58.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/preferenceUniqueValid_1.xml 2011-04-14 17:14:27.000000000 +0200 @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <image schemaversion="5.1" name="suse-11.3-xen-guest"> <description type="system"> - <author>Marcus Schäfer</author> - <contact>ms@novell.com</contact> + <author>Robert Schweikert</author> + <contact>rschweikert@novell.com</contact> <specification>test preference section uniqueness</specification> </description> <profiles> - <profile name="xenFlavour" description="VMX with Xen kernel" import="true"/> - <profile name="ec2Flavour" description="VMX with default kernel"/> + <profile name="xenFlavor" description="VMX with Xen kernel" import="true"/> + <profile name="vmwFlavor" description="VMX with default kernel"/> </profiles> <preferences> - <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> + <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> <version>1.1.2</version> <packagemanager>zypper</packagemanager> <rpm-check-signatures>false</rpm-check-signatures> @@ -24,7 +24,7 @@ <locale>en_US</locale> <keytable>us.map.gz</keytable> </preferences> - <preferences profiles="xenFlavour"> + <preferences profiles="xenFlavor"> <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="xenk"> <machine memory="128" domain="domU"> <vmdisk controller="ide" id="0" device="/dev/xvda"/> @@ -32,17 +32,11 @@ </machine> </type> </preferences> - <preferences profiles="ec2Flavour"> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="ec2" format="ec2"> + <preferences profiles="vmwFlavor"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" format="vmdk"> <machine memory="128" domain="domU"> - <vmdisk controller="ide" id="0" device="/dev/xvda"/> - <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> + <vmdisk controller="ide" id="0"/> </machine> - <ec2config> - <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> - <ec2certfile>Path to EC2 public certificate file</ec2certfile> - <ec2accountnr>12345678911</ec2accountnr> - </ec2config> </type> </preferences> @@ -57,15 +51,15 @@ <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> <package name="ifplugd"/> <package name="vim"/> - <package name="xen-tools-domU"/> - <package name="xen"/> <opensusePattern name="base"/> </packages> - <packages type="image" profiles="xenFlavour"> - <package name="kernel-xen" replaces="kernel-ec2"/> + <packages type="image" profiles="xenFlavor"> + <package name="kernel-xen" replaces="kernel-default"/> + <package name="xen-tools-domU"/> + <package name="xen"/> </packages> - <packages type="image" profiles="ec2Flavour"> - <package name="kernel-ec2" replaces="kernel-xen"/> + <packages type="image" profiles="vmwFlavor"> + <package name="kernel-default" replaces="kernel-xen"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/profileReferenceExistInvalid_1.xml new/kiwi/tests/unit/data/kiwiXMLValidator/profileReferenceExistInvalid_1.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/profileReferenceExistInvalid_1.xml 2011-04-08 14:27:58.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/profileReferenceExistInvalid_1.xml 2011-04-14 17:14:27.000000000 +0200 @@ -6,13 +6,13 @@ <specification>test profile cross references</specification> </description> <preferences> - <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> + <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> <version>1.1.2</version> <packagemanager>zypper</packagemanager> <rpm-check-signatures>false</rpm-check-signatures> @@ -20,7 +20,7 @@ <locale>en_US</locale> <keytable>us.map.gz</keytable> </preferences> - <preferences profiles="xenFlavour"> + <preferences profiles="xenFlavor"> <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="xenk"> <machine memory="128" domain="domU"> <vmdisk controller="ide" id="0" device="/dev/xvda"/> @@ -28,17 +28,11 @@ </machine> </type> </preferences> - <preferences profiles="ec2Flavour"> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="ec2" format="ec2"> - <machine memory="128" domain="domU"> - <vmdisk controller="ide" id="0" device="/dev/xvda"/> - <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> + <preferences profiles="vmwFlavor"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" format="vmdk"> + <machine memory="128"> + <vmdisk controller="ide" id="0"/> </machine> - <ec2config> - <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> - <ec2certfile>Path to EC2 public certificate file</ec2certfile> - <ec2accountnr>12345678911</ec2accountnr> - </ec2config> </type> </preferences> @@ -53,15 +47,15 @@ <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> <package name="ifplugd"/> <package name="vim"/> - <package name="xen-tools-domU"/> - <package name="xen"/> <opensusePattern name="base"/> </packages> - <packages type="image" profiles="xenFlavour"> - <package name="kernel-xen" replaces="kernel-ec2"/> + <packages type="image" profiles="xenFlavor"> + <package name="kernel-xen" replaces="kernel-default"/> + <package name="xen-tools-domU"/> + <package name="xen"/> </packages> - <packages type="image" profiles="ec2Flavour"> - <package name="kernel-ec2" replaces="kernel-xen"/> + <packages type="image" profiles="vmwFlavor"> + <package name="kernel-default" replaces="kernel-xen"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/profileReferenceExistInvalid_2.xml new/kiwi/tests/unit/data/kiwiXMLValidator/profileReferenceExistInvalid_2.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/profileReferenceExistInvalid_2.xml 2011-04-08 14:27:58.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/profileReferenceExistInvalid_2.xml 2011-04-14 17:14:27.000000000 +0200 @@ -6,13 +6,13 @@ <specification>test profile cross references</specification> </description> <preferences> - <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> + <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> <version>1.1.2</version> <packagemanager>zypper</packagemanager> <rpm-check-signatures>false</rpm-check-signatures> @@ -31,15 +31,15 @@ <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> <package name="ifplugd"/> <package name="vim"/> - <package name="xen-tools-domU"/> - <package name="xen"/> <opensusePattern name="base"/> </packages> - <packages type="image" profiles="xenFlavour"> - <package name="kernel-xen" replaces="kernel-ec2"/> + <packages type="image" profiles="xenFlavor"> + <package name="kernel-xen" replaces="kernel-default"/> + <package name="xen-tools-domU"/> + <package name="xen"/> </packages> - <packages type="image" profiles="ec2Flavour"> - <package name="kernel-ec2" replaces="kernel-xen"/> + <packages type="image" profiles="vmwFlavor"> + <package name="kernel-default" replaces="kernel-xen"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/typeUniqueInvalid_1.xml new/kiwi/tests/unit/data/kiwiXMLValidator/typeUniqueInvalid_1.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/typeUniqueInvalid_1.xml 2011-04-08 14:27:58.000000000 +0200 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/typeUniqueInvalid_1.xml 2011-04-14 17:14:27.000000000 +0200 @@ -6,17 +6,17 @@ <specification>test multiple same type settings</specification> </description> <profiles> - <profile name="xenFlavour" description="VMX with Xen kernel" import="true"/> - <profile name="ec2Flavour" description="VMX with default kernel"/> + <profile name="xenFlavor" description="VMX with Xen kernel" import="true"/> + <profile name="vmwFlavor" description="VMX with default kernel"/> </profiles> <preferences> - <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> - <oemconfig> - <oem-reboot>true</oem-reboot> - <oem-swap>false</oem-swap> - <oem-unattended>true</oem-unattended> - </oemconfig> - </type> + <type primary="true" image="oem" filesystem="ext4" boot="oemboot/suse-11.3" installiso="true" installboot="install"> + <oemconfig> + <oem-reboot>true</oem-reboot> + <oem-swap>false</oem-swap> + <oem-unattended>true</oem-unattended> + </oemconfig> + </type> <version>1.1.2</version> <packagemanager>zypper</packagemanager> <rpm-check-signatures>false</rpm-check-signatures> @@ -24,27 +24,21 @@ <locale>en_US</locale> <keytable>us.map.gz</keytable> </preferences> - <preferences profiles="xenFlavour"> + <preferences profiles="xenFlavor"> <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="xenk"> <machine memory="128" domain="domU"> <vmdisk controller="ide" id="0" device="/dev/xvda"/> <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> </machine> </type> - <type image="iso" boot="isoboot/suse-11.3" hybrid="true" flags="clic"/> - <type image="iso" boot="isoboot/suse-11.3" hybrid="true" flags="clic"/> + <type image="iso" boot="isoboot/suse-11.3" hybrid="true" flags="clic"/> + <type image="iso" boot="isoboot/suse-11.3" hybrid="true" flags="clic"/> </preferences> - <preferences profiles="ec2Flavour"> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="ec2" format="ec2"> - <machine memory="128" domain="domU"> - <vmdisk controller="ide" id="0" device="/dev/xvda"/> - <vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/> + <preferences profiles="vmwFlavor"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" format="vmdk"> + <machine memory="128"> + <vmdisk controller="ide" id="0"/> </machine> - <ec2config> - <ec2privatekeyfile>Path to EC2 private key file</ec2privatekeyfile> - <ec2certfile>Path to EC2 public certificate file</ec2certfile> - <ec2accountnr>12345678911</ec2accountnr> - </ec2config> </type> </preferences> @@ -60,14 +54,14 @@ <package name="ifplugd"/> <package name="vim"/> <package name="xen-tools-domU"/> - <package name="xen"/> <opensusePattern name="base"/> </packages> - <packages type="image" profiles="xenFlavour"> - <package name="kernel-xen" replaces="kernel-ec2"/> + <packages type="image" profiles="xenFlavor"> + <package name="kernel-xen" replaces="kernel-default"/> + <package name="xen"/> </packages> - <packages type="image" profiles="ec2Flavour"> - <package name="kernel-ec2" replaces="kernel-xen"/> + <packages type="image" profiles="vmwFlavor"> + <package name="kernel-default" replaces="kernel-xen"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiXMLValidator.pm new/kiwi/tests/unit/lib/Test/kiwiXMLValidator.pm --- old/kiwi/tests/unit/lib/Test/kiwiXMLValidator.pm 2011-04-08 14:27:58.000000000 +0200 +++ new/kiwi/tests/unit/lib/Test/kiwiXMLValidator.pm 2011-04-14 17:14:27.000000000 +0200 @@ -301,6 +301,36 @@ } #========================================== +# test_ec2IsFileSys +#------------------------------------------ +sub test_ec2IsFileSys { + # ... + # Test that the image type for the EC2 format is a file system image + # --- + my $this = shift; + my @invalidConfigs = $this -> __getInvalidFiles('ec2IsFS'); + for my $iConfFile (@invalidConfigs) { + my $validator = $this -> __getValidator($iConfFile); + $validator -> validate(); + my $kiwi = $this -> {kiwi}; + my $msg = $kiwi -> getMessage(); + my $expectedMsg = 'For EC2 image creation the image type must be ' + . 'one of the following supported file systems: ext2 ext3 ' + . 'ext4 reiserfs'; + my @supportedFS = qw /ext2 ext3 ext4 reiserfs/; + $this -> assert_str_equals($expectedMsg, $msg); + my $msgT = $kiwi -> getMessageType(); + $this -> assert_str_equals('error', $msgT); + my $state = $kiwi -> getState(); + $this -> assert_str_equals('failed', $state); + # Test this condition last to get potential error messages + $this -> assert_not_null($validator); + } + my @validConfigs = $this -> __getValidFiles('ec2IsFS'); + $this -> __verifyValid(@validConfigs); +} + +#========================================== # test_ec2Regions #------------------------------------------ sub test_ec2Regions { @@ -540,7 +570,7 @@ . 'using the "profiles" attribute.'; } elsif ($iConfFile =~ /preferenceUniqueInvalid_2.xml/) { $expectedMsg = 'Only one <preferences> element may reference a ' - . 'given profile. xenFlavour referenced multiple times.'; + . 'given profile. xenFlavor referenced multiple times.'; } $this -> assert_str_equals($expectedMsg, $msg); my $msgT = $kiwi -> getMessageType(); @@ -603,7 +633,7 @@ my $msg = $kiwi -> getMessage(); my $expectedMsg = 'Found reference to profile "'; if ($iConfFile =~ /profileReferenceExistInvalid_(1|2).xml/) { - $expectedMsg .= 'ec2Flavour'; + $expectedMsg .= 'vmwFlavor'; } elsif ($iConfFile =~ /profileReferenceExistInvalid_(3|4).xml/) { $expectedMsg .= 'ola'; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org