Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-07-05 17:56:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2015-06-18 06:36:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-07-05 17:56:42.000000000 +0200 @@ -1,0 +2,84 @@ +Fri Jun 19 14:12:05 CEST 2015 - [email protected] + +- v7.02.57 released + +------------------------------------------------------------------- +Fri Jun 19 14:03:03 CEST 2015 - [email protected] + +- Fixed grub.cfg for Xen dom0 images + + bogus information was added within a menuentry section + +------------------------------------------------------------------- +Thu Jun 18 12:16:59 CEST 2015 - [email protected] + +- Fixed zipl setup + + zipl does not allow a targetgeometry if the target type is + different from CDL or LDL + +------------------------------------------------------------------- +Thu Jun 18 12:12:45 CEST 2015 - [email protected] + +- Fixed use of union type in pxe setup + + The reference on clicfs was still present in the schema and the + runtime checks. However clicfs is out of support and overlayfs + is the only union filesystem we really support + +------------------------------------------------------------------- +Wed Jun 17 16:02:17 CEST 2015 - [email protected] + +- Update s390 JeOS image description + + for the oem and vmx types build the disk for a DASD target + in CDL mode (ECKD). Also make this clear in the name of the + generated image + +------------------------------------------------------------------- +Wed Jun 17 15:26:10 CEST 2015 - [email protected] + +- Fixed diskOffset calcuation for s390 + + zipl wants the number of blocks to indicate the start of + the first partition, not the number of tracks + +------------------------------------------------------------------- +Wed Jun 17 11:04:16 CEST 2015 - [email protected] + +- Fixed zipl installation for LDL/CDL on loop device + + Installing zipl on the LDL/CDL target device types requires + to specify the disk geometry. zipl is not able to get that + information from a loop device. Therefore we need to hand + over a targetgeometry which matches the loop geometry + +------------------------------------------------------------------- +Wed Jun 17 10:08:26 CEST 2015 - [email protected] + +- TypoFix: for for -> do for + +------------------------------------------------------------------- +Tue Jun 16 10:45:25 CEST 2015 - [email protected] + +- Update selector for partitioner tool + + If we are building a dasd image using the new loop driver which + supports 4k devices, we need a way to select fdasd as partitioner + on s390. This can be done via commandline options but is now also + auto selected if a zipl_targettype of CDL or LDL is specified + +------------------------------------------------------------------- +Tue Jun 16 10:44:42 CEST 2015 - [email protected] + +- Implement setup of loop logical sector size + + The new loop driver capability allows to set a custom blocksize + on setup of the loop device. The attribute value from the + target_blocksize attribute is used in losetup as follows: + +-L target_blocksize + + This fixes (bnc#931634) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.3dRJV0/_old 2015-07-05 17:56:44.000000000 +0200 +++ /var/tmp/diff_new_pack.3dRJV0/_new 2015-07-05 17:56:44.000000000 +0200 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.02.56 +Version: 7.02.57 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc ++++++ kiwi-docu.tar.bz2 ++++++ ++++++ 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 2015-02-19 21:11:51.000000000 +0100 +++ new/kiwi/.revision 2014-12-15 14:32:44.000000000 +0100 @@ -1 +1 @@ -eaaf05e687b5f18cc0ac406bc8d85cfce68b612e +a30ba0572f3aea37bd09ef435165b10574bd6285 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/distribution/kiwi-instsource-plugins-SLE-12/KIWIMiniIsoPlugin.pm new/kiwi/distribution/kiwi-instsource-plugins-SLE-12/KIWIMiniIsoPlugin.pm --- old/kiwi/distribution/kiwi-instsource-plugins-SLE-12/KIWIMiniIsoPlugin.pm 2015-02-19 19:17:57.000000000 +0100 +++ new/kiwi/distribution/kiwi-instsource-plugins-SLE-12/KIWIMiniIsoPlugin.pm 2015-06-19 11:35:26.000000000 +0200 @@ -102,7 +102,7 @@ } if ($ismini !~ m{mini}i) { $this->logMsg("I", - "Nothing to for for media type <$ismini>" + "Nothing to do for media type <$ismini>" ); return $retval; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIMiniIsoPlugin.pm new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIMiniIsoPlugin.pm --- old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIMiniIsoPlugin.pm 2015-02-23 18:42:57.000000000 +0100 +++ new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIMiniIsoPlugin.pm 2015-06-19 11:35:26.000000000 +0200 @@ -103,7 +103,7 @@ } if ($ismini !~ m{mini}i) { $this->logMsg("I", - "Nothing to for for media type <$ismini>" + "Nothing to do for media type <$ismini>" ); return $retval; } 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 2015-06-12 08:30:07.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2015-06-19 12:05:58.000000000 +0200 @@ -27,6 +27,7 @@ use File::Spec; use Math::BigFloat; use Config::IniFiles; +use Scalar::Util 'looks_like_number'; #========================================== # Base class @@ -468,6 +469,13 @@ if ($preferences) { $ptool = $preferences -> getPartitioner(); } + my $type = $xml -> getImageType(); + if ($type) { + my $zipl_target = $type -> getZiplTargetType(); + if (($zipl_target) && ($zipl_target =~ /LDL|CDL/)) { + $ptool = 'fdasd'; + } + } } if ($cmdL -> getPartitioner()) { # commandline specified partitioner overwrites all @@ -4251,7 +4259,7 @@ if ($type->{cmdline}) { $cmdline = $type->{cmdline}; } - if ($cmdline =~ /root=(.*)/) { + if (($cmdline) && ($cmdline =~ /root=(.*)/)) { $kiwi -> info ( "Kernel root device set to $1 via custom cmdline\n" ); @@ -4572,80 +4580,19 @@ print $FD "\t"."set gfxpayload=$gfx"."\n"; print $FD "\t"."module $bootpath/linux.vmx dummy"; } else { - print $FD 'set prefix=($root)'.$bootpath.'/grub2'."\n"; + print $FD "\t"."echo Loading Xen\n"; + print $FD "\t"."multiboot $bootpath/xen.gz dummy\n"; + print $FD "\t"."echo Loading linux...\n"; + print $FD "\t"."set gfxpayload=$gfx"."\n"; + print $FD "\t"."module $bootpath/linux dummy"; } - # print $FD "set debug=all\n"; - print $FD "set default=$defaultBootNr\n"; - print $FD "set font=$bootpath/unicode.pf2"."\n"; - # setup to use boot graphics. If this is unwanted - # you can disable it with the following alternative - # console setup - # - # print $FD "\t".'terminal_input console'."\n"; - # print $FD "\t".'terminal_output console'."\n"; - # - print $FD 'if loadfont $font ;then'."\n"; - print $FD "\t"."set gfxmode=$gfx"."\n"; - print $FD "\t".'terminal_input gfxterm'."\n"; - print $FD "\t".'if terminal_output gfxterm;then true;else'."\n"; - print $FD "\t\t".'terminal gfxterm'."\n"; - print $FD "\t".'fi'."\n"; - print $FD 'fi'."\n"; - print $FD 'if loadfont '.$fodir.$theme.'/'.$ascii.';then'."\n"; - foreach my $font (@fonts) { - print $FD "\t".'loadfont '.$fodir.$theme.'/'.$font."\n"; - } - print $FD "\t".'set theme='.$fodir.$theme.'/theme.txt'."\n"; - print $FD "\t".'background_image -m stretch '; - print $FD $fodir.$theme.'/background.png'."\n"; - print $FD 'fi'."\n"; - # ---- - my $bootTimeout = 10; - if (defined $type->{boottimeout}) { - $bootTimeout = $type->{boottimeout}; - } - if ($type->{fastboot}) { - $bootTimeout = 0; - } - print $FD "set timeout=$bootTimeout\n"; - if ($topic =~ /^KIWI (CD|USB)/) { - my $dev = $1 eq 'CD' ? '(cd)' : '(hd0,0)'; - my $arch = $this->{arch}; - print $FD 'menuentry "Boot from Hard Disk"'; - print $FD ' --class opensuse --class os {'."\n"; - if (($firmware eq "efi") || ($firmware eq "uefi")) { - print $FD "\t"."set root='hd0,1'"."\n"; - my $prefix = '(${root})/EFI/BOOT'; - if ($arch eq 'x86_64') { - print $FD "\t"."chainloader $prefix/bootx64.efi"."\n"; - } elsif ($arch =~ /i.86/) { - print $FD "\t"."chainloader $prefix/bootx32.efi"."\n"; - } elsif (($arch eq 'aarch64') || ($arch eq 'arm64')) { - print $FD "\t"."chainloader $prefix/bootaa64.efi"."\n"; - } elsif ($arch =~ /arm/) { - print $FD "\t"."chainloader $prefix/bootarm.efi"."\n"; - } - } else { - print $FD "\t"."set root='hd0'"."\n"; - if ($dev eq '(cd)') { - print $FD "\t".'chainloader +1'."\n"; - } else { - print $FD "\t"."chainloader $bootpath/grub2/bootnext\n"; - my $bootnext = $this -> addBootNext ( - "$tmpdir/boot/grub2/bootnext", hex $this->{mbrid} - ); - if (! defined $bootnext) { - $kiwi -> failed (); - $kiwi -> error ("Failed to write bootnext\n"); - $kiwi -> failed (); - $FD -> close(); - return; - } - } - print $FD "\t".'boot'."\n"; - } - print $FD '}'."\n"; - $title = $this -> quoteLabel ("Install $label"); + print $FD $cmdline; + if ($iso) { + print $FD "\t"."echo Loading initrd...\n"; + print $FD "\t"."module $bootpath/initrd dummy\n"; + } elsif (($topic=~ /^KIWI USB/)||($imgtype=~ /vmx|oem|split/)) { + print $FD "\t"."echo Loading initrd...\n"; + print $FD "\t"."module $bootpath/initrd.vmx dummy\n"; } else { print $FD "\t"."echo Loading initrd...\n"; print $FD "\t"."module $bootpath/initrd dummy\n"; @@ -6040,6 +5987,7 @@ 'DiskSectorSize' ); } + my $chs = $this -> diskCHS($diskname); my $type = $xml -> getImageType() -> getZiplTargetType(); if (! $type) { if ($bsize == 4096) { @@ -6085,6 +6033,10 @@ print $zconffd "\t"."targettype = $type"."\n"; print $zconffd "\t"."targetblocksize = $bsize"."\n"; print $zconffd "\t"."targetoffset = $offset"."\n"; + if ($type =~ /CDL|LDL/) { + $kiwi -> info ("--> targetgeometry = $chs\n"); + print $zconffd "\t"."targetgeometry = $chs"."\n"; + } } } $zconffd -> close(); @@ -7317,16 +7269,27 @@ my $disk = shift; my $kiwi = $this->{kiwi}; my $tool = $this->{ptool}; + my $global = KIWIGlobals -> instance(); my $offset; my $result; my $status; if ($tool eq 'fdasd') { - $status = KIWIQX::qxx( - "fdasd -f -s -p $disk | tr -s ' ' | cut -f2 -d ' '" + my $loop = $global -> loop_setup($disk, $this->{xml}); + my $track_blocks = KIWIQX::qxx( + "fdasd -f -p $loop | grep 'blocks per track' | cut -f2 -d:" ); $result = $? >> 8; - chomp $status; - $offset = $status; + chomp $track_blocks; + my $start_tracks = 0; + if ($result == 0) { + $start_tracks = KIWIQX::qxx( + "fdasd -f -s -p $loop | head -n 1 | tr -s ' ' | cut -f3 -d ' '" + ); + $result = $? >> 8; + chomp $start_tracks; + } + $global -> loop_delete($loop); + $offset = int($track_blocks) * int($start_tracks); } else { $status = KIWIQX::qxx( "parted -m $disk unit s print 2>&1" @@ -7348,12 +7311,12 @@ $kiwi -> failed(); return; } - if ((! defined $offset) || ($offset <= 0)) { - if (! defined $offset) { - $kiwi -> error ("empty partition offset: $status"); - } else { - $kiwi -> error ("bogus partition offset: $offset"); - } + if (! $offset) { + $kiwi -> error ("empty partition offset: $status"); + $kiwi -> failed(); + return; + } elsif (! looks_like_number($offset)) { + $kiwi -> error ("bogus partition offset: $offset"); $kiwi -> failed(); return; } @@ -7361,6 +7324,54 @@ } #========================================== +# diskCHS +#------------------------------------------ +sub diskCHS { + my $this = shift; + my $disk = shift; + my $kiwi = $this->{kiwi}; + my $tool = $this->{ptool}; + my $global = KIWIGlobals -> instance(); + my $cylinders; + my $tracks; + my $blocks; + my $result; + if ($tool ne 'fdasd') { + $kiwi -> error ("CHS retrieval only implemented for fdasd"); + $kiwi -> failed(); + return; + } + my $loop = $global -> loop_setup($disk, $this->{xml}); + $cylinders = KIWIQX::qxx( + "fdasd -f -p $loop | grep cylinders | cut -f2 -d:" + ); + $result = $? >> 8; + chomp $cylinders; + if ($result == 0) { + $tracks = KIWIQX::qxx( + "fdasd -f -p $loop | grep 'tracks per cylinder' | cut -f2 -d:" + ); + $result = $? >> 8; + chomp $tracks; + } + if ($result == 0) { + $blocks = KIWIQX::qxx( + "fdasd -f -p $loop | grep 'blocks per track' | cut -f2 -d:" + ); + $result = $? >> 8; + chomp $blocks; + } + $global -> loop_delete($loop); + if ($result != 0) { + $kiwi -> error ("Failed to obtain CHS geometry"); + $kiwi -> failed(); + return; + } + return sprintf "%d,%d,%d", + int($cylinders), int($tracks), int($blocks); +} + +#========================================== # Destructor #------------------------------------------ sub DESTROY { 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 2015-06-12 09:36:30.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2015-06-19 14:12:00.000000000 +0200 @@ -170,13 +170,22 @@ my $kiwi = $this->{kiwi}; my $locator = KIWILocator -> instance(); my $losetup_exec = $locator -> getExecPath("losetup"); + my $logical_sector_size = ''; if (! $losetup_exec) { $kiwi -> error("losetup not found on build system"); $kiwi -> failed(); return; } + if ($xml) { + my $bldType = $xml -> getImageType(); + my $blocksize = $bldType -> getTargetBlockSize(); + my $default_blocksize = $this -> getKiwiConfigEntry('DiskSectorSize'); + if (($blocksize) && ($blocksize != $default_blocksize)) { + $logical_sector_size = "-L $blocksize"; + } + } my $result = KIWIQX::qxx ( - "$losetup_exec -f --show $source 2>&1" + "$losetup_exec $logical_sector_size -f --show $source 2>&1" ); my $status = $? >> 8; if ($status != 0) { @@ -185,16 +194,6 @@ return; } chomp $result; - if ($xml) { - my $bldType = $xml -> getImageType(); - my $blocksize = $bldType -> getTargetBlockSize(); - my $default_blocksize = $this -> getKiwiConfigEntry('DiskSectorSize'); - if (($blocksize) && ($blocksize != $default_blocksize)) { - # Once there is a loop driver with custom block size setup - # available check here for a configured target_blocksize and - # apply the value to the loop - } - } return $result; } @@ -1943,7 +1942,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.02.56"; + $data{Version} = "7.02.57"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";; $data{ConfigName} = "config.xml"; 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 2015-06-12 08:30:07.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2015-06-19 11:35:26.000000000 +0200 @@ -10905,16 +10905,14 @@ function loop_setup { local IFS=$IFS_ORIG local target=$1 - local loop=$(losetup -f --show $target) + local logical_sector_size + if [ ! -z "$kiwi_target_blocksize" ];then + logical_sector_size="-L $kiwi_target_blocksize" + fi + local loop=$(losetup $logical_sector_size -f --show $target) if [ ! -e "$loop" ];then return 1 fi - if [ ! -z "$kiwi_target_blocksize" ];then - # Once there is a loop driver with custom block size setup - # available check here for a configured target_blocksize and - # apply the value to the loop - : - fi echo $loop } #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRuntimeChecker.pm new/kiwi/modules/KIWIRuntimeChecker.pm --- old/kiwi/modules/KIWIRuntimeChecker.pm 2015-06-12 09:27:44.000000000 +0200 +++ new/kiwi/modules/KIWIRuntimeChecker.pm 2015-06-19 11:35:26.000000000 +0200 @@ -426,7 +426,7 @@ return 1; } my $name = $type -> getTypeName(); - if ($name !~ /oem|vmx|pxe/) { + if ($name !~ /oem|vmx/) { return 1; } my $bootloader = $type -> getBootLoader(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc --- old/kiwi/modules/KIWISchema.rnc 2015-05-31 20:45:46.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rnc 2015-06-19 11:35:26.000000000 +0200 @@ -1921,7 +1921,7 @@ k.union.rw.attribute = ## Device for Read-Write attribute rw { text } - k.union.type.attribute = attribute type { "clicfs" } + k.union.type.attribute = attribute type { "overlayfs" } k.union.attlist = k.union.ro.attribute & k.union.rw.attribute & diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng --- old/kiwi/modules/KIWISchema.rng 2015-05-31 20:45:46.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rng 2015-06-19 11:35:26.000000000 +0200 @@ -2712,7 +2712,7 @@ </define> <define name="k.union.type.attribute"> <attribute name="type"> - <value>clicfs</value> + <value>overlayfs</value> </attribute> </define> <define name="k.union.attlist"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLPXEDeployData.pm new/kiwi/modules/KIWIXMLPXEDeployData.pm --- old/kiwi/modules/KIWIXMLPXEDeployData.pm 2015-02-19 19:17:57.000000000 +0100 +++ new/kiwi/modules/KIWIXMLPXEDeployData.pm 2015-06-19 11:35:26.000000000 +0200 @@ -132,7 +132,7 @@ $this->{server} = '192.168.1.1'; } if (! $this->{unionType} ) { - $this->{unionType} = "clicfs"; + $this->{unionType} = "overlayfs"; } if ($this->{partitions}) { $this -> __applyPartitionDefaultSettings(); @@ -240,8 +240,8 @@ $kiwi -> failed(); return; } - if ($unionType ne 'clicfs') { - my $msg = 'createUnionFSConfig: unionType argument must be "clicfs".'; + if ($unionType ne 'overlayfs') { + my $msg = 'createUnionFSConfig: unionType argument must be "overlayfs".'; $kiwi -> error($msg); $kiwi -> failed(); return; @@ -945,9 +945,9 @@ } } if ($init->{unionType}) { - if ($init->{unionType} ne 'clicfs') { + if ($init->{unionType} ne 'overlayfs') { my $msg = 'Type specified for union fs is not supported, only ' - . '"clicfs" is supported'; + . '"overlayfs" is supported'; $kiwi -> error($msg); $kiwi -> failed(); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/s390/suse-SLE12-JeOS/config.xml new/kiwi/template/s390/suse-SLE12-JeOS/config.xml --- old/kiwi/template/s390/suse-SLE12-JeOS/config.xml 2015-05-22 21:38:41.000000000 +0200 +++ new/kiwi/template/s390/suse-SLE12-JeOS/config.xml 2015-06-19 11:35:26.000000000 +0200 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<image schemaversion="6.1" name="LimeJeOS-SLE12"> +<image schemaversion="6.1" name="LimeJeOS-DASD-ECKD-SLE12"> <description type="system"> <author>Marcus Schaefer</author> - <contact>[email protected]</contact> + <contact>[email protected]</contact> <specification>SUSE Linux Enterprise 12 JeOS</specification> </description> <preferences> @@ -17,8 +17,8 @@ <keytable>us.map.gz</keytable> <timezone>Europe/Berlin</timezone> <hwclock>utc</hwclock> - <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12" bootloader="zipl" primary="true"/> - <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES12" bootloader="zipl"> + <type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES12" bootloader="zipl" primary="true" target_blocksize="4096" zipl_targettype="CDL"/> + <type image="oem" filesystem="ext3" boot="oemboot/suse-SLES12" bootloader="zipl" target_blocksize="4096" zipl_targettype="CDL"> <systemdisk/> <oemconfig> <oem-swap>true</oem-swap> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml new/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml --- old/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml 2015-02-19 19:17:57.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml 2015-06-19 11:35:26.000000000 +0200 @@ -7,7 +7,7 @@ <specification>Test configuration to verify PXE settings are stored and returned properly in the XML object</specification> </description> <preferences> - <type image="pxe" filesystem="clicfs" boot="netboot/suse-12.1" installiso="true"> + <type image="pxe" filesystem="overlayfs" boot="netboot/suse-12.1" installiso="true"> <pxedeploy server="192.168.100.2" blocksize="4096"> <configuration arch="x86_64,i686,armv5tel,armv7l,ppc64,ppc" dest="target" source="installSource"/> <configuration arch="s390" dest="zdrive" source="s390Img"/> @@ -19,7 +19,7 @@ <partition type="L" number="3" target="false"/> </partitions> <timeout>20</timeout> - <union ro="/dev/sda2" rw="/dev/sda3" type="clicfs"/> + <union ro="/dev/sda2" rw="/dev/sda3" type="overlayfs"/> </pxedeploy> </type> <version>0.0.1</version> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXML/pxeSettingsInvArch/config.xml new/kiwi/tests/unit/data/kiwiXML/pxeSettingsInvArch/config.xml --- old/kiwi/tests/unit/data/kiwiXML/pxeSettingsInvArch/config.xml 2015-02-19 19:17:57.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXML/pxeSettingsInvArch/config.xml 2015-06-19 11:35:26.000000000 +0200 @@ -7,7 +7,7 @@ <specification>Test configuration to verify PXE settings are stored and returned properly in the XML object</specification> </description> <preferences> - <type image="pxe" filesystem="clicfs" boot="netboot/suse-12.1" installiso="true"> + <type image="pxe" filesystem="overlayfs" boot="netboot/suse-12.1" installiso="true"> <pxedeploy server="192.168.100.2" blocksize="4096"> <configuration arch="x86_64,i686,armv95,ppc64,ppc" dest="target" source="installSource"/> <initrd>/pxeSetup/specialInitrd</initrd> @@ -18,7 +18,7 @@ <partition type="L" number="3" target="false"/> </partitions> <timeout>20</timeout> - <union ro="/dev/sda2" rw="/dev/sda3" type="clicfs"/> + <union ro="/dev/sda2" rw="/dev/sda3" type="overlayfs"/> </pxedeploy> </type> <version>0.0.1</version> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXML/typeSettings/config.xml new/kiwi/tests/unit/data/kiwiXML/typeSettings/config.xml --- old/kiwi/tests/unit/data/kiwiXML/typeSettings/config.xml 2015-02-19 19:17:57.000000000 +0100 +++ new/kiwi/tests/unit/data/kiwiXML/typeSettings/config.xml 2015-06-19 11:35:26.000000000 +0200 @@ -24,14 +24,14 @@ <keytable>us.map.gz</keytable> </preferences> <preferences profiles="aTest"> - <type image="pxe" filesystem="clicfs" boot="netboot/suse-12.1"> + <type image="pxe" filesystem="overlayfs" boot="netboot/suse-12.1"> <pxedeploy server="192.168.100.2" blocksize="4096"> <partitions device="/dev/sda"> <partition type="swap" number="1" size="5"/> <partition type="L" number="2" size="image" mountpoint="/" target="true"/> <partition type="L" number="3" target="false"/> </partitions> - <union ro="/dev/sda2" rw="/dev/sda3" type="clicfs"/> + <union ro="/dev/sda2" rw="/dev/sda3" type="overlayfs"/> </pxedeploy> </type> <type image="vmx" filesystem="ext3" boot="vmxboot/suse-12.1" bootprofile="xen" bootkernel="xenk"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiXML.pm new/kiwi/tests/unit/lib/Test/kiwiXML.pm --- old/kiwi/tests/unit/lib/Test/kiwiXML.pm 2015-06-12 09:21:32.000000000 +0200 +++ new/kiwi/tests/unit/lib/Test/kiwiXML.pm 2015-06-19 11:35:26.000000000 +0200 @@ -5181,7 +5181,7 @@ $this -> assert_str_equals('20', $timeout); $this -> assert_str_equals('/dev/sda2', $unionRO); $this -> assert_str_equals('/dev/sda3', $unionRW); - $this -> assert_str_equals('clicfs', $unionT); + $this -> assert_str_equals('overlayfs', $unionT); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/lib/Test/kiwiXMLPXEDeployData.pm new/kiwi/tests/unit/lib/Test/kiwiXMLPXEDeployData.pm --- old/kiwi/tests/unit/lib/Test/kiwiXMLPXEDeployData.pm 2015-02-19 19:17:57.000000000 +0100 +++ new/kiwi/tests/unit/lib/Test/kiwiXMLPXEDeployData.pm 2015-06-19 11:35:26.000000000 +0200 @@ -558,7 +558,7 @@ $pxeDataObj = $pxeDataObj -> createUnionFSConfig( '/dev/sdc1', '/dev/sdc2', - 'clicfs' + 'overlayfs' ); my $msg = $kiwi -> getMessage(); $this -> assert_str_equals('No messages set', $msg); @@ -590,7 +590,7 @@ $this -> assert_str_equals('none', $msgT); $state = $kiwi -> getState(); $this -> assert_str_equals('No state set', $state); - $this -> assert_str_equals('clicfs', $unionType); + $this -> assert_str_equals('overlayfs', $unionType); return; } @@ -607,7 +607,7 @@ $pxeDataObj = $pxeDataObj -> createUnionFSConfig( '/dev/sdc1', '/dev/sdc2', - 'clicfs' + 'overlayfs' ); my $msg = $kiwi -> getMessage(); my $expected = 'createUnionFSConfig: overwriting existing union fs ' @@ -641,7 +641,7 @@ $this -> assert_str_equals('none', $msgT); $state = $kiwi -> getState(); $this -> assert_str_equals('No state set', $state); - $this -> assert_str_equals('clicfs', $unionType); + $this -> assert_str_equals('overlayfs', $unionType); return; } @@ -660,7 +660,7 @@ 'aufs' ); my $msg = $kiwi -> getMessage(); - my $expected = 'createUnionFSConfig: unionType argument must be "clicfs".'; + my $expected = 'createUnionFSConfig: unionType argument must be "overlayfs".'; $this -> assert_str_equals($expected, $msg); my $msgT = $kiwi -> getMessageType(); $this -> assert_str_equals('error', $msgT); @@ -868,7 +868,7 @@ my $pxeDataObj = KIWIXMLPXEDeployData -> new(\%init); my $msg = $kiwi -> getMessage(); my $expected = 'Type specified for union fs is not supported, only ' - . '"clicfs" is supported'; + . '"overlayfs" is supported'; $this -> assert_str_equals($expected, $msg); my $msgT = $kiwi -> getMessageType(); $this -> assert_str_equals('error', $msgT); @@ -958,7 +958,7 @@ my $kiwi = $this -> {kiwi}; my %init = ( unionRW => '/dev/sdb2', - unionType => 'clicfs' + unionType => 'overlayfs' ); my $pxeDataObj = KIWIXMLPXEDeployData -> new(\%init); my $msg = $kiwi -> getMessage(); @@ -1014,7 +1014,7 @@ my $kiwi = $this -> {kiwi}; my %init = ( unionRO => '/dev/sdb1', - unionType => 'clicfs' + unionType => 'overlayfs' ); my $pxeDataObj = KIWIXMLPXEDeployData -> new(\%init); my $msg = $kiwi -> getMessage(); @@ -1042,7 +1042,7 @@ my $kiwi = $this -> {kiwi}; my %init = ( unionRW => '/dev/sdb2', - unionType => 'clicfs' + unionType => 'overlayfs' ); my $pxeDataObj = KIWIXMLPXEDeployData -> new(\%init); my $msg = $kiwi -> getMessage(); @@ -1070,7 +1070,7 @@ my $kiwi = $this -> {kiwi}; my %init = ( unionRO => '/dev/sdb1', - unionType => 'clicfs' + unionType => 'overlayfs' ); my $pxeDataObj = KIWIXMLPXEDeployData -> new(\%init); my $msg = $kiwi -> getMessage(); @@ -1146,7 +1146,7 @@ # --- my $this = shift; my $kiwi = $this -> {kiwi}; - my %init = ( unionType => 'clicfs' ); + my %init = ( unionType => 'overlayfs' ); my $pxeDataObj = KIWIXMLPXEDeployData -> new(\%init); my $msg = $kiwi -> getMessage(); my $expected = 'Incomplete initialization hash "unionRO", ' @@ -1340,7 +1340,7 @@ $this -> assert_str_equals('none', $msgT); $state = $kiwi -> getState(); $this -> assert_str_equals('No state set', $state); - $this -> assert_str_equals('clicfs', $unionType); + $this -> assert_str_equals('overlayfs', $unionType); return; } @@ -2096,7 +2096,7 @@ $this -> assert_str_equals('none', $msgT); my $state = $kiwi -> getState(); $this -> assert_str_equals('No state set', $state); - $this -> assert_str_equals('clicfs', $unionType); + $this -> assert_str_equals('overlayfs', $unionType); return; } @@ -2129,7 +2129,7 @@ . '<partition mountpoint="/home" number="2" size="50G" type="0x83"/>' . '</partitions>' . '<timeout>45</timeout>' - . '<union ro="/dev/sdb1" rw="/dev/sdb2" type="clicfs"/>' + . '<union ro="/dev/sdb1" rw="/dev/sdb2" type="overlayfs"/>' . '</pxedeploy>'; $this -> assert_str_equals($expected, $xmlstr); return; @@ -3129,7 +3129,7 @@ timeout => '45', unionRO => '/dev/sdb1', unionRW => '/dev/sdb2', - unionType => 'clicfs' + unionType => 'overlayfs' ); my $pxeDataObj = KIWIXMLPXEDeployData -> new(\%init); my $msg = $kiwi -> getMessage();
