Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2012-04-17 07:45:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-04-11 11:00:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-04-17 07:45:40.000000000 +0200 @@ -1,0 +2,92 @@ +Mon Apr 16 10:34:09 CEST 2012 - ms@suse.de + +- v5.02.23 released + +------------------------------------------------------------------- +Fri Apr 13 22:51:27 CEST 2012 - ms@suse.de + +- DB: rebuild documentation + +------------------------------------------------------------------- +Fri Apr 13 22:50:32 CEST 2012 - ms@suse.de + +- DB: update documentation + +------------------------------------------------------------------- +Fri Apr 13 22:49:50 CEST 2012 - ms@suse.de + +- added preCallInit hook to be available for the vmx type too + +------------------------------------------------------------------- +Fri Apr 13 21:22:56 CEST 2012 - ms@suse.de + +- fixed partition based oem install method. parsing proc/partitions + was broken in OEMFindPartitions because the ID device name was + used as reference instead of the unix device name + +------------------------------------------------------------------- +Thu Apr 12 16:51:37 CEST 2012 - rjschwei@suse.de + +- properly pick up splash image for pre-built initrd. At present + it is not possible to use a splash screen with a prebuilt + initrd. For a pre-built initrd the splash file is named with + extension '.spl', but we are loking for the extension '.splash.gz', + thus the file is not found. With this change we look for the + file with the appropriate extension. + +------------------------------------------------------------------- +Wed Apr 11 22:26:56 CEST 2012 - ms@suse.de + +- update list of allowed VMware guestOS values + +------------------------------------------------------------------- +Wed Apr 11 19:25:33 CEST 2012 - winter@suse.de + +- Fix the handling of the --mbrid command line switch + The value passed to the --mbrid flag is parsed to an integer by + GetOptions (format is 'o' = extended integer). There is code + checking whether this integer is within the expected range and + formats it as hexadecimal value. But commit: + + a5c7ab512dfb02dd99044c1db1cbc46ab05bf221 + + introduced a regression in the way the value of the --mbrid flag + was handled because the value is set using $cmdL -> setMBRID() + before the range checking and conversion. + +------------------------------------------------------------------- +Wed Apr 11 19:00:19 CEST 2012 - rjschwei@suse.de + +- prepare the code for the move of the udev tools to the usr + tree. At present the location of udevadmin is hardcoded to + /sbin, once the tools move into the /usr tree and a link + exists the '-x' test will fail. This would result in broken + images. + +------------------------------------------------------------------- +Mon Apr 9 09:54:32 CEST 2012 - rjschwei@suse.de + +- Do not allow whitespce in the value of the name attribute for the + <systemdisk> and <volume> elements. At present the user can specify + a name containing whitespace. This leads to problems that are + difficult to diagnose in when the user tries to run the resulting + image, as the image will not properly operate. + +------------------------------------------------------------------- +Sun Apr 8 10:24:28 CEST 2012 - rjschwei@suse.de + +- Fix ownership issue with persistent tmpdir + At present the script fails if /var/tmp does not exist. Although /var/tmp + should always exist, the new code assures proper handling if this directory + is missing. + +------------------------------------------------------------------- +Sun Apr 8 10:06:45 CEST 2012 - rjschwei@suse.de + +- Fix race condition in launch script for openNebula test + At present the test script may cause a condition where the openNebula + infrastructure issues a "[VirtualMachineAllocate] Error allocating a + new virtual machine. Could not get disk image for VM." message. Giving + the system some time to copy the image file eliminates this issue. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.mWH9A1/_old 2012-04-17 07:45:42.000000000 +0200 +++ /var/tmp/diff_new_pack.mWH9A1/_new 2012-04-17 07:45:42.000000000 +0200 @@ -22,7 +22,7 @@ Summary: OpenSuSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.02.22 +Version: 5.02.23 Release: 0 # requirements to build packages BuildRequires: gcc-c++ ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/.revision 2012-04-16 10:34:41.000000000 +0200 @@ -1 +1 @@ -8d9922ac6cea5a82fe6899b52d0e6efe10e7e1f6 +4bbb0941600b205a7d11bab3599e1641bbd85fd4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/kiwi.pl 2012-04-16 10:34:41.000000000 +0200 @@ -880,7 +880,13 @@ # check if MBRID is specified #---------------------------------------- if (defined $MBRID) { - $cmdL -> setMBRID ($MBRID); + if ($MBRID < 0 || $MBRID > 0xffffffff) { + $kiwi -> error ("Invalid mbrid"); + $kiwi -> failed (); + kiwiExit (1); + } + + $cmdL -> setMBRID (sprintf ("0x%08x", $MBRID)); } #======================================== # check if default answer is specified @@ -1301,14 +1307,6 @@ if (defined $SetImageType) { $cmdL -> setBuildType($SetImageType); } - if (defined $MBRID) { - if ($MBRID < 0 || $MBRID > 0xffffffff) { - $kiwi -> error ("Invalid mbrid"); - $kiwi -> failed (); - kiwiExit (1); - } - $MBRID = sprintf ("0x%08x", $MBRID); - } } #========================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2012-04-04 14:47:04.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2012-04-16 10:34:46.000000000 +0200 @@ -42,7 +42,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.02.22"; + $data{Version} = "5.02.23"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImage.pm new/kiwi/modules/KIWIImage.pm --- old/kiwi/modules/KIWIImage.pm 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/modules/KIWIImage.pm 2012-04-16 10:34:46.000000000 +0200 @@ -439,8 +439,8 @@ } my $pinitrd = $lookup.$bootImageName.".gz"; my $psplash; - if (-f $lookup.$bootImageName.".splash.gz") { - $psplash = $lookup.$bootImageName.".splash.gz"; + if (-f $lookup.$bootImageName.'.spl') { + $psplash = $lookup.$bootImageName.'.spl'; } my $plinux = $lookup.$bootImageName.".kernel"; if (! -f $pinitrd) { 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 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2012-04-16 10:34:46.000000000 +0200 @@ -526,9 +526,12 @@ #-------------------------------------- function udevPending { local timeout=30 - if [ -x /sbin/udevadm ];then - /sbin/udevadm settle --timeout=$timeout + local udevadmExec=$(which udevadm 2>/dev/null) + if [ -x $udevadmExec ];then + $udevadmExec settle --timeout=$timeout else + # udevsettle exists on old distros and is not + # affected by the move from sbin to usr /sbin/udevsettle --timeout=$timeout fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm --- old/kiwi/modules/KIWIXML.pm 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2012-04-16 10:34:46.000000000 +0200 @@ -2922,10 +2922,16 @@ if (! defined $hwver) { $hwver = 4; } - $guestos{suse}{ix86} = "suse"; - $guestos{suse}{x86_64} = "suse-64"; - $guestos{sles}{ix86} = "sles"; - $guestos{sles}{x86_64} = "sles-64"; + $guestos{suse}{ix86} = "suse"; + $guestos{suse}{x86_64} = "suse-64"; + $guestos{sles}{ix86} = "sles"; + $guestos{sles}{x86_64} = "sles-64"; + $guestos{rhel6}{x86_64} = "rhel6-64"; + $guestos{rhel6}{ix86} = "rhel6"; + $guestos{rhel5}{x86_64} = "rhel5-64"; + $guestos{rhel5}{ix86} = "rhel5"; + $guestos{centos}{ix86} = "centos"; + $guestos{centos}{x86_64} = "centos-64"; my $guest= $node -> getAttribute ("guestOS"); if ((!defined $guest) || (! defined $guestos{$guest}{$arch})) { if ($arch eq "ix86") { 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 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/modules/KIWIXMLValidator.pm 2012-04-16 10:34:41.000000000 +0200 @@ -745,6 +745,36 @@ } #========================================== +# __checkSysdiskNameNoWhitespace +#------------------------------------------ +sub __checkSysdiskNameNoWhitespace { + # ... + # Check that the name attribute of the <systemdisk> element does not + # contain white space + # --- + my $this = shift; + my $systemTree = $this -> {systemTree}; + my @sysdiskNodes = $systemTree -> getElementsByTagName('systemdisk'); + if (! @sysdiskNodes ) { + return 1; + } + for my $sysdiskNode (@sysdiskNodes) { + my $name = $sysdiskNode -> getAttribute('name'); + if ($name) { + if ($name =~ /\s/x) { + my $kiwi = $this -> {kiwi}; + my $msg = 'Found whitespace in name given for systemdisk. ' + . 'Provided name may not contain whitespace.'; + $kiwi -> error($msg); + $kiwi -> failed(); + return; + } + } + } + return 1; +} + +#========================================== # __checkTypeConfigConsist #------------------------------------------ sub __checkTypeConfigConsist { @@ -877,6 +907,34 @@ } #========================================== +# __checkVolNameNoWhitespace +#------------------------------------------ +sub __checkVolNameNoWhitespace { + # ... + # Check that the name attribute of the <volume> element does not + # contain white space + # --- + my $this = shift; + my $systemTree = $this -> {systemTree}; + my @volumeNodes = $systemTree -> getElementsByTagName('volume'); + if (! @volumeNodes ) { + return 1; + } + for my $volNode (@volumeNodes) { + my $name = $volNode -> getAttribute('name'); + if ($name =~ /\s/x) { + my $kiwi = $this -> {kiwi}; + my $msg = 'Found whitespace in given volume name. ' + . 'Provided name may not contain whitespace.'; + $kiwi -> error($msg); + $kiwi -> failed(); + return; + } + } + return 1; +} + +#========================================== # __getXMLDocTree #------------------------------------------ sub __getXMLDocTree { @@ -989,7 +1047,10 @@ if (! $this -> __checkRevision()) { return; } - if (! $this -> __checkTypeConfigConsist()) { + if (! $this -> __checkSysdiskNameNoWhitespace()) { + return; + } + if (! $this -> __checkTypeConfigConsist()) { return; } if (! $this -> __checkTypeUnique()) { @@ -998,6 +1059,9 @@ if (! $this -> __checkVersionDefinition()) { return; } + if (! $this -> __checkVolNameNoWhitespace()) { + return; + } return 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-dump new/kiwi/system/boot/armv7l/oemboot/suse-dump --- old/kiwi/system/boot/armv7l/oemboot/suse-dump 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-dump 2012-04-16 10:34:46.000000000 +0200 @@ -328,7 +328,7 @@ "reboot" fi while true;do - partitions=$(OEMFindPartitions $instDisk) + partitions=$(OEMFindPartitions $(getDiskDevice $instDisk)) if [ ! -z "$partitions" ];then count=0 IFS="," diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/vmxboot/suse-preinit new/kiwi/system/boot/armv7l/vmxboot/suse-preinit --- old/kiwi/system/boot/armv7l/vmxboot/suse-preinit 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/system/boot/armv7l/vmxboot/suse-preinit 2012-04-16 10:34:46.000000000 +0200 @@ -89,7 +89,12 @@ createOriginSnapshot #====================================== -# 11) kill udev +# 11) Run user script +#-------------------------------------- +runHook preCallInit + +#====================================== +# 12) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-dump new/kiwi/system/boot/ix86/oemboot/suse-dump --- old/kiwi/system/boot/ix86/oemboot/suse-dump 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2012-04-16 10:34:46.000000000 +0200 @@ -328,7 +328,7 @@ "reboot" fi while true;do - partitions=$(OEMFindPartitions $instDisk) + partitions=$(OEMFindPartitions $(getDiskDevice $instDisk)) if [ ! -z "$partitions" ];then count=0 IFS="," diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-preinit new/kiwi/system/boot/ix86/vmxboot/rhel-preinit --- old/kiwi/system/boot/ix86/vmxboot/rhel-preinit 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-preinit 2012-04-16 10:34:46.000000000 +0200 @@ -94,7 +94,12 @@ authconfig --updateall #====================================== -# 11) kill udev +# 12) Run user script +#-------------------------------------- +runHook preCallInit + +#====================================== +# 13) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-preinit new/kiwi/system/boot/ix86/vmxboot/suse-preinit --- old/kiwi/system/boot/ix86/vmxboot/suse-preinit 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-preinit 2012-04-16 10:34:46.000000000 +0200 @@ -89,7 +89,12 @@ createOriginSnapshot #====================================== -# 11) kill udev +# 11) Run user script +#-------------------------------------- +runHook preCallInit + +#====================================== +# 12) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-dump new/kiwi/system/boot/ppc/oemboot/suse-dump --- old/kiwi/system/boot/ppc/oemboot/suse-dump 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-dump 2012-04-16 10:34:46.000000000 +0200 @@ -328,7 +328,7 @@ "reboot" fi while true;do - partitions=$(OEMFindPartitions $instDisk) + partitions=$(OEMFindPartitions $(getDiskDevice $instDisk)) if [ ! -z "$partitions" ];then count=0 IFS="," diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-preinit new/kiwi/system/boot/ppc/vmxboot/suse-preinit --- old/kiwi/system/boot/ppc/vmxboot/suse-preinit 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/system/boot/ppc/vmxboot/suse-preinit 2012-04-16 10:34:46.000000000 +0200 @@ -89,7 +89,12 @@ createOriginSnapshot #====================================== -# 11) kill udev +# 11) Run user script +#-------------------------------------- +runHook preCallInit + +#====================================== +# 12) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems 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 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-dump 2012-04-16 10:34:46.000000000 +0200 @@ -328,7 +328,7 @@ "reboot" fi while true;do - partitions=$(OEMFindPartitions $instDisk) + partitions=$(OEMFindPartitions $(getDiskDevice $instDisk)) if [ ! -z "$partitions" ];then count=0 IFS="," diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-preinit new/kiwi/system/boot/s390/vmxboot/suse-preinit --- old/kiwi/system/boot/s390/vmxboot/suse-preinit 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-preinit 2012-04-16 10:34:46.000000000 +0200 @@ -102,7 +102,12 @@ createOriginSnapshot #====================================== -# 12) kill udev +# 12) Run user script +#-------------------------------------- +runHook preCallInit + +#====================================== +# 13) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceInvalid_1.xml new/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceInvalid_1.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceInvalid_1.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceInvalid_1.xml 2012-04-16 10:34:41.000000000 +0200 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.3" name="suse-12.1-test-image"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rjschwei@suse.com</contact> + <specification>test whitespace in system disk name attribute value</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-12.1"> + <machine memory="512"> + <vmdisk controller="scsi" id="0"/> + </machine> + <systemdisk name="my vol"> + <volume name="tmp"/> + </systemdisk> + </type> + <version>0.0.1</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> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://12.1/repo/oss/"/> + </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-default"/> + <package name="vim"/> + <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/sysdiskWhitespaceInvalid_2.xml new/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceInvalid_2.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceInvalid_2.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceInvalid_2.xml 2012-04-16 10:34:41.000000000 +0200 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.3" name="suse-12.1-test-image"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rjschwei@suse.com</contact> + <specification>test whitespace in system disk name attribute value</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-12.1"> + <machine memory="512"> + <vmdisk controller="scsi" id="0"/> + </machine> + <systemdisk name="nameW tab"> + <volume name="tmp"/> + </systemdisk> + </type> + <version>0.0.1</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> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://12.1/repo/oss/"/> + </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-default"/> + <package name="vim"/> + <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/sysdiskWhitespaceValid_1.xml new/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceValid_1.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceValid_1.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceValid_1.xml 2012-04-16 10:34:41.000000000 +0200 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.3" name="suse-12.1-test-image"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rjschwei@suse.com</contact> + <specification>test whitespace in system disk name attribute value</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-12.1"> + <machine memory="512"> + <vmdisk controller="scsi" id="0"/> + </machine> + <systemdisk name="myLVMname"> + <volume name="tmp"/> + </systemdisk> + </type> + <version>0.0.1</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> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://12.1/repo/oss/"/> + </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-default"/> + <package name="vim"/> + <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/sysdiskWhitespaceValid_2.xml new/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceValid_2.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceValid_2.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/sysdiskWhitespaceValid_2.xml 2012-04-16 10:34:41.000000000 +0200 @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.3" name="suse-12.1-test-image"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rjschwei@suse.com</contact> + <specification>test whitespace in system disk name attribute value</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-12.1"> + <machine memory="512"> + <vmdisk controller="scsi" id="0"/> + </machine> + </type> + <version>0.0.1</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> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://12.1/repo/oss/"/> + </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-default"/> + <package name="vim"/> + <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/volumeWhitespaceInvalid_1.xml new/kiwi/tests/unit/data/kiwiXMLValidator/volumeWhitespaceInvalid_1.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/volumeWhitespaceInvalid_1.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/volumeWhitespaceInvalid_1.xml 2012-04-16 10:34:41.000000000 +0200 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.3" name="suse-12.1-test-image"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rjschwei@suse.com</contact> + <specification>test whitespace in volume name attribute value</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-12.1"> + <machine memory="512"> + <vmdisk controller="scsi" id="0"/> + </machine> + <systemdisk name="myVolume"> + <volume name="tmp onTmp"/> + </systemdisk> + </type> + <version>0.0.1</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> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://12.1/repo/oss/"/> + </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-default"/> + <package name="vim"/> + <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/volumeWhitespaceInvalid_2.xml new/kiwi/tests/unit/data/kiwiXMLValidator/volumeWhitespaceInvalid_2.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/volumeWhitespaceInvalid_2.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/volumeWhitespaceInvalid_2.xml 2012-04-16 10:34:41.000000000 +0200 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.3" name="suse-12.1-test-image"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rjschwei@suse.com</contact> + <specification>test whitespace in volume name attribute value</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-12.1"> + <machine memory="512"> + <vmdisk controller="scsi" id="0"/> + </machine> + <systemdisk name="myVolume"> + <volume name="nameW tab"/> + </systemdisk> + </type> + <version>0.0.1</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> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://12.1/repo/oss/"/> + </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-default"/> + <package name="vim"/> + <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/volumeWhitespaceValid_1.xml new/kiwi/tests/unit/data/kiwiXMLValidator/volumeWhitespaceValid_1.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/volumeWhitespaceValid_1.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/volumeWhitespaceValid_1.xml 2012-04-16 10:34:41.000000000 +0200 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.3" name="suse-12.1-test-image"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rjschwei@suse.com</contact> + <specification>test whitespace in volume name attribute value</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-12.1"> + <machine memory="512"> + <vmdisk controller="scsi" id="0"/> + </machine> + <systemdisk name="myLVMname"> + <volume name="tmp"/> + </systemdisk> + </type> + <version>0.0.1</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> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://12.1/repo/oss/"/> + </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-default"/> + <package name="vim"/> + <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/volumeWhitespaceValid_2.xml new/kiwi/tests/unit/data/kiwiXMLValidator/volumeWhitespaceValid_2.xml --- old/kiwi/tests/unit/data/kiwiXMLValidator/volumeWhitespaceValid_2.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXMLValidator/volumeWhitespaceValid_2.xml 2012-04-16 10:34:41.000000000 +0200 @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<image schemaversion="5.3" name="suse-12.1-test-image"> + <description type="system"> + <author>Robert Schweikert</author> + <contact>rjschwei@suse.com</contact> + <specification>test whitespace in volume name attribute value</specification> + </description> + <preferences> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-12.1"> + <machine memory="512"> + <vmdisk controller="scsi" id="0"/> + </machine> + </type> + <version>0.0.1</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> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="yast2"> + <source path="opensuse://12.1/repo/oss/"/> + </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-default"/> + <package name="vim"/> + <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/lib/Test/kiwiXMLValidator.pm new/kiwi/tests/unit/lib/Test/kiwiXMLValidator.pm --- old/kiwi/tests/unit/lib/Test/kiwiXMLValidator.pm 2012-04-04 14:47:00.000000000 +0200 +++ new/kiwi/tests/unit/lib/Test/kiwiXMLValidator.pm 2012-04-16 10:34:41.000000000 +0200 @@ -677,6 +677,35 @@ } #========================================== +# test_sysdiskNameAttrNoWhiteSpace +#------------------------------------------ +sub test_sysdiskNameAttrNoWhiteSpace { + # ... + # Test that the value of the name attribute of the <systemdisk> + # element does not contain whitespace. + # --- + my $this = shift; + my @invalidConfigs = $this -> __getInvalidFiles('sysdiskWhitespace'); + my $expectedMsg = 'Found whitespace in name given for systemdisk. ' + . 'Provided name may not contain whitespace.'; + for my $iConfFile (@invalidConfigs) { + my $validator = $this -> __getValidator($iConfFile); + $validator -> validate(); + my $kiwi = $this -> {kiwi}; + my $msg = $kiwi -> getMessage(); + $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('sysdiskWhitespace'); + $this -> __verifyValid(@validConfigs); +} + +#========================================== # test_typeConfigConsist #------------------------------------------ sub test_typeConfigConsist { @@ -777,6 +806,35 @@ $this -> __verifyValid(@validConfigs); } +#========================================== +# test_volumeNameAttrNoWhiteSpace +#------------------------------------------ +sub test_volumeNameAttrNoWhiteSpace { + # ... + # Test that the value of the name attribute of the <volume> + # element does not contain whitespace. + # --- + my $this = shift; + my @invalidConfigs = $this -> __getInvalidFiles('volumeWhitespace'); + my $expectedMsg = 'Found whitespace in given volume name. ' + . 'Provided name may not contain whitespace.'; + for my $iConfFile (@invalidConfigs) { + my $validator = $this -> __getValidator($iConfFile); + $validator -> validate(); + my $kiwi = $this -> {kiwi}; + my $msg = $kiwi -> getMessage(); + $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('volumeWhitespace'); + $this -> __verifyValid(@validConfigs); +} + #========================================== # Private helper methods #------------------------------------------ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org