Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2015-12-03 13:26:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-30 16:35:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2015-12-03 13:26:57.000000000 +0100 @@ -1,0 +2,111 @@ +Thu Nov 26 09:59:31 CET 2015 - [email protected] + +- v7.03.37 released + +------------------------------------------------------------------- +Thu Nov 26 09:58:17 CET 2015 - [email protected] + +- Update suse-leap-42.1-JeOS + + Use ext4 as write filesystem in overlayfs, btrfs is broken + for this use case (bnc#950999) + +------------------------------------------------------------------- +Thu Nov 26 09:57:25 CET 2015 - [email protected] + +- Allow ext4 to be set in hybridpersistent_filesystem + +------------------------------------------------------------------- +Fri Nov 20 09:12:27 CET 2015 - [email protected] + +- v7.03.36 released + +------------------------------------------------------------------- +Wed Nov 18 11:43:17 CET 2015 - [email protected] + +- fix appdata generation on product builds with multiple media + +------------------------------------------------------------------- +Tue Nov 17 16:49:13 CET 2015 - [email protected] + +- v7.03.35 released + +------------------------------------------------------------------- +Tue Nov 17 12:48:38 CET 2015 - [email protected] + +- Retrieve vm tools version from vmtoolsd + +------------------------------------------------------------------- +Mon Nov 16 15:45:39 CET 2015 - [email protected] + +- Deleted __checkMountDependencies runtime check + + I'm afraid but this check causes more false positives than the + correct detection of an inconsistency in the mount table. Checking + if the string 'kiwi' appears in the process list is not enough, + especially in contained environment where the host kernel shares + mount information with a VM or container guest this check is + always wrong. We need a better solution here. Fixes Issue#501 + +------------------------------------------------------------------- +Mon Nov 16 15:18:26 CET 2015 - [email protected] + +- Added Leap 42.1 support for kiwi --describe + + Allow to analyse Leap Systems, fixes Issue #516 + +------------------------------------------------------------------- +Tue Nov 10 10:20:27 CET 2015 - [email protected] + +- Bundle all built OEM images + + it is valid to build multiple OEM targets, e.g. with + <type ... installiso='true' installpxe='true' image='oem'> and + KIWI correctly builds an install.iso and an install.tar.xz in + this case. However, when using OBS only the install.iso is + exported. This is, because "kiwi --bundle-build" will only export + one image and return. + Change this to export all: .iso, .raw and .tar.xz + +------------------------------------------------------------------- +Wed Nov 4 23:16:33 CET 2015 - [email protected] + +- Translated using Weblate (Dutch) + + Currently translated at 82.1% (23 of 28 strings) + +------------------------------------------------------------------- +Mon Nov 2 17:00:47 CET 2015 - [email protected] + +- Translated using Weblate (Russian) + + Currently translated at 100.0% (28 of 28 strings) + +------------------------------------------------------------------- +Sun Nov 1 20:01:51 CET 2015 - [email protected] + + [kiwi] add searching in the parent directory for the current path for device drivers, kernel modules packages like openSUSE xen-kmp-default put the drivers there + +------------------------------------------------------------------- +Thu Oct 29 07:42:54 CET 2015 - [email protected] + +- Translated using Weblate (Spanish) + + Currently translated at 100.0% (28 of 28 strings) + +------------------------------------------------------------------- +Wed Oct 28 12:24:41 CET 2015 - [email protected] + +- Added vmdk descriptor update + + VMWare applications are made aware that an image has vm-tools installed + via tags appended to the VMDK's metadata. Typically, the tools write + the metadata during their first run, but in our case the first run of + the tools is the first boot of the appliance, so the host application + is not aware of tools until after a VM has been rebooted, missing a + critical opportunity to configure an instance before or during the + first boot. In order to allow VMWare applications (include vCloud) + to be aware that vm-tools are installed, we need to add the appropriate + metadata to the image during its creation + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.Oo1oXr/_old 2015-12-03 13:26:59.000000000 +0100 +++ /var/tmp/diff_new_pack.Oo1oXr/_new 2015-12-03 13:26:59.000000000 +0100 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.03.34 +Version: 7.03.37 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-09-14 11:57:46.000000000 +0200 +++ new/kiwi/.revision 2015-09-14 11:57:46.000000000 +0200 @@ -1 +1 @@ -9ae4fe6e35b21f6134d8a74c158cb9699e2f2929 +75ba66ddd43a689dd5b7d1d0cc71c704b5d42344 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/distribution/kiwi-instsource-plugins-SLE-12-SP1/KIWIDescrPlugin.pm new/kiwi/distribution/kiwi-instsource-plugins-SLE-12-SP1/KIWIDescrPlugin.pm --- old/kiwi/distribution/kiwi-instsource-plugins-SLE-12-SP1/KIWIDescrPlugin.pm 2015-10-14 10:46:12.000000000 +0200 +++ new/kiwi/distribution/kiwi-instsource-plugins-SLE-12-SP1/KIWIDescrPlugin.pm 2015-11-19 15:25:16.000000000 +0100 @@ -237,7 +237,7 @@ foreach my $p (@paths) { $cmd = "/usr/bin/openSUSE-appstream-process"; $cmd .= " $p"; - $cmd .= " $targetdir"; + $cmd .= " $p/$descrdir"; $call = $this -> callCmd($cmd); $status = $call->[0]; my $out = join("\n",@{$call->[1]}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIDescrPlugin.pm new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIDescrPlugin.pm --- old/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIDescrPlugin.pm 2015-09-10 15:20:49.000000000 +0200 +++ new/kiwi/distribution/kiwi-instsource-plugins-openSUSE-13-2/KIWIDescrPlugin.pm 2015-11-19 15:25:17.000000000 +0100 @@ -237,7 +237,7 @@ foreach my $p (@paths) { $cmd = "/usr/bin/openSUSE-appstream-process"; $cmd .= " $p"; - $cmd .= " $targetdir"; + $cmd .= " $p/$descrdir"; $call = $this -> callCmd($cmd); $status = $call->[0]; my $out = join("\n",@{$call->[1]}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/es/LC_MESSAGES/kiwi.po new/kiwi/locale/es/LC_MESSAGES/kiwi.po --- old/kiwi/locale/es/LC_MESSAGES/kiwi.po 2015-10-13 18:14:51.000000000 +0200 +++ new/kiwi/locale/es/LC_MESSAGES/kiwi.po 2015-11-17 12:53:24.000000000 +0100 @@ -13,15 +13,15 @@ "Project-Id-Version: kiwi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2011-02-23 19:40+0100\n" -"Last-Translator: Javier Llorente <[email protected]>\n" -"Language-Team: Spanish <[email protected]>\n" +"PO-Revision-Date: 2015-10-29 07:42+0200\n" +"Last-Translator: Adolfo Jayme Barrientos <[email protected]>\n" +"Language-Team: Spanish <http://10n.opensuse.org/projects/kiwi/master/es/>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.1\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.3\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -29,25 +29,25 @@ #. boot code for KIWI #. msgid "Boot continues in 10 sec" -msgstr "" +msgstr "El arranque continuará en 10 s" msgid "Enter LUKS passphrase" -msgstr "Introduzca la frase de paso de LUKS" +msgstr "Escriba la contraseña de LUKS" msgid "Do you accept the license agreement ?" msgstr "¿Acepta el acuerdo de licencia?" msgid "Do you want to start the System-Recovery ?" -msgstr "¿Desea iniciar la recuperación del sistema?" +msgstr "¿Quiere iniciar la recuperación del sistema?" msgid "Do you want to start the System-Restore ?" -msgstr "¿Desea iniciar la restauración del sistema?" +msgstr "¿Quiere iniciar la restauración del sistema?" msgid "Restoring base operating system..." -msgstr "Restaurando sistema operativo base..." +msgstr "Restaurando la base del sistema operativo..." msgid "Destroying ALL data on %1, continue ?" -msgstr "Se van a destruir TODOS los datos de %1, ¿continuar?" +msgstr "Se van a destruir TODOS los datos de %1. ¿Continuar?" msgid "Clean sweep..." msgstr "Eliminando..." @@ -56,7 +56,7 @@ msgstr "Restaurados %1 archivos de %2..." msgid "backing up: %1..." -msgstr "Realizando copia de seguridad: %1..." +msgstr "realizando copia de seguridad: %1..." msgid "archiving: %1..." msgstr "guardando: %1..." @@ -80,18 +80,21 @@ msgstr "Salir" msgid "Bootloader installation has failed" -msgstr "" +msgstr "Falló la instalación del gestor de arranque" msgid "" "The system will not be able to reboot. Please make sure to fixup and install " "the bootloader before next reboot. Check /var/log/boot.kiwi for details" msgstr "" +"El sistema no podrá reiniciarse. Asegúrese de reparar e instalar el gestor " +"de arranque antes de reiniciar el equipo. Para obtener detalles, revise " +"/var/log/boot.kiwi" msgid "Please remove the CD/DVD before reboot" -msgstr "Por favor extraiga el CD/DVD de instalación antes de reiniciar" +msgstr "Extraiga el CD/DVD de instalación antes de reiniciar" msgid "Please unplug the USB stick before reboot" -msgstr "Por favor retire la memoria USB de instalación antes de reiniciar" +msgstr "Retire el soporte USB de instalación antes de reiniciar" msgid "Installation..." msgstr "Instalación..." @@ -110,8 +113,7 @@ msgstr "Seleccionar la partición %1 para la instalación:" msgid "System will be shutdown. Remove USB stick before power on" -msgstr "" +msgstr "El sistema se apagará. Retire el soporte USB antes de encenderlo" -#, fuzzy msgid "Please remove the CD/DVD before shutdown" -msgstr "Porfavor extraiga el CD/DVD de instalación antes de continuar" +msgstr "Extraiga el CD/DVD de instalación antes de apagar" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/nl/LC_MESSAGES/kiwi.po new/kiwi/locale/nl/LC_MESSAGES/kiwi.po --- old/kiwi/locale/nl/LC_MESSAGES/kiwi.po 2015-10-13 18:14:52.000000000 +0200 +++ new/kiwi/locale/nl/LC_MESSAGES/kiwi.po 2015-11-17 12:53:24.000000000 +0100 @@ -27,7 +27,7 @@ #. boot code for KIWI #. msgid "Boot continues in 10 sec" -msgstr "" +msgstr "Opstarten gaat verder na 10 seconden" msgid "Enter LUKS passphrase" msgstr "Voer LUKS wachtwoordzin in" @@ -83,12 +83,15 @@ msgstr "Stoppen" msgid "Bootloader installation has failed" -msgstr "" +msgstr "Installatie van bootloader is mislukt" msgid "" "The system will not be able to reboot. Please make sure to fixup and install " "the bootloader before next reboot. Check /var/log/boot.kiwi for details" msgstr "" +"Het systeem zal niet in staat zijn om opnieuw op te starten (boot). Repareer " +"dit en installeer de bootloader vóór de volgende herstart. Controleer " +"/var/log/boot.kiwi voor details" msgid "Please remove the CD/DVD before reboot" msgstr "Gaarne de installatie cd/dvd verwijderen voor het opnieuw opstarten" @@ -115,7 +118,8 @@ msgid "System will be shutdown. Remove USB stick before power on" msgstr "" +"Systeem zal worden afgesloten. Verwijder de USB-stick alvorens het systeem " +"aan te zetten" -#, fuzzy msgid "Please remove the CD/DVD before shutdown" -msgstr "Gaarne de installatie cd/dvd uitwerpen alvorens door te gaan" +msgstr "De installatie-cd/dvd verwijderen alvorens af te sluiten" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/ru/LC_MESSAGES/kiwi.po new/kiwi/locale/ru/LC_MESSAGES/kiwi.po --- old/kiwi/locale/ru/LC_MESSAGES/kiwi.po 2015-10-13 18:14:52.000000000 +0200 +++ new/kiwi/locale/ru/LC_MESSAGES/kiwi.po 2015-11-17 12:53:24.000000000 +0100 @@ -4,16 +4,16 @@ "Project-Id-Version: kiwi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-14 08:40+0100\n" -"PO-Revision-Date: 2010-04-10 20:32+0300\n" -"Last-Translator: Alexander Melentyev <[email protected]>\n" -"Language-Team: Russian <[email protected]>\n" +"PO-Revision-Date: 2015-11-02 17:00+0200\n" +"Last-Translator: Alex Minton <[email protected]>\n" +"Language-Team: Russian <http://10n.opensuse.org/projects/kiwi/master/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.3\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -21,7 +21,7 @@ #. boot code for KIWI #. msgid "Boot continues in 10 sec" -msgstr "" +msgstr "Загрузка продолжится через 10 секунд" msgid "Enter LUKS passphrase" msgstr "Введите пароль для LUKS" @@ -72,12 +72,14 @@ msgstr "Выход" msgid "Bootloader installation has failed" -msgstr "" +msgstr "Не удалось установить загрузчик" msgid "" "The system will not be able to reboot. Please make sure to fixup and install " "the bootloader before next reboot. Check /var/log/boot.kiwi for details" msgstr "" +"Система не сможет перезагрузиться. Обязательно исправьте это и установите " +"загрузчик до следующей перезагрузки. Подробнее см. в /var/log/boot.kiwi" msgid "Please remove the CD/DVD before reboot" msgstr "Перед перезагрузкой выньте CD/DVD" @@ -101,8 +103,7 @@ msgstr "Выберите раздел (%1) для установки:" msgid "System will be shutdown. Remove USB stick before power on" -msgstr "" +msgstr "Система будет отключена. Выньте USB-брелок перед запуском" -#, fuzzy msgid "Please remove the CD/DVD before shutdown" -msgstr "Перед продолжением извлеките установочный CD/DVD" +msgstr "Перед отключением извлеките CD/DVD" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIAnalyse.systems new/kiwi/metadata/KIWIAnalyse.systems --- old/kiwi/metadata/KIWIAnalyse.systems 2015-09-10 15:20:52.000000000 +0200 +++ new/kiwi/metadata/KIWIAnalyse.systems 2015-11-17 12:53:24.000000000 +0100 @@ -32,3 +32,4 @@ openSUSE-12.3=suse-12.3 openSUSE-13.1=suse-13.1 openSUSE-13.2=suse-13.2 +openSUSE-42.1=suse-leap42.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2015-09-10 15:20:52.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2015-11-17 12:53:24.000000000 +0100 @@ -1474,9 +1474,6 @@ #========================================== # check for weak-/updates and backup them #------------------------------------------ - if [ -d $kversion/updates ];then - mv $kversion/updates /tmp - fi if [ -d $kversion/weak-updates ];then mv $kversion/weak-updates /tmp fi @@ -1487,7 +1484,7 @@ for mod in $(echo $kiwi_drivers | tr , ' '); do local path=`/usr/bin/dirname $mod` local base=`/usr/bin/basename $mod` - for d in kernel;do + for d in "." kernel updates;do if [ "$base" = "*" ];then if test -d $kversion/$d/$path ; then mkdir -pv $stripdir$kversion/$d/$path @@ -1540,9 +1537,6 @@ if [ -f /tmp/modules.order ];then mv /tmp/modules.order $kversion fi - if [ -d /tmp/updates ];then - mv /tmp/updates $kversion - fi if [ -d /tmp/weak-updates ];then mv /tmp/weak-updates $kversion fi 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-10-20 16:07:57.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2015-11-26 09:59:25.000000000 +0100 @@ -1933,7 +1933,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.03.34"; + $data{Version} = "7.03.37"; $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/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2015-09-10 15:20:52.000000000 +0200 +++ new/kiwi/modules/KIWIImageFormat.pm 2015-11-17 16:38:19.000000000 +0100 @@ -358,6 +358,8 @@ my $result; my $diskCnt; my $diskMode; + my $tools_install_type = 4; + my $global = KIWIGlobals -> instance(); if ($vmdata) { $diskCnt = $vmdata -> getSystemDiskController(); $diskMode = $vmdata -> getSystemDiskMode(); @@ -366,6 +368,23 @@ if (! $qemu_img) { return; } + my $image_root_path = KIWIQX::qxx ("mktemp -qdt kiwi_root.XXXXXX"); + chomp $image_root_path; + if (! $global -> mount ($source, $image_root_path)) { + return; + } + my $tools_version = KIWIQX::qxx ( + "chroot $image_root_path /usr/bin/vmtoolsd --version 2>/dev/null" + ); + $global -> umount(); + unlink($image_root_path); + if ($tools_version) { + if ($tools_version =~ /version (.*)\.(.*)\.(.*)\.(.*?)\s/) { + $tools_version=(int($1) * 1024) + (int($2) * 32) + $3; + } else { + undef $tools_version; + } + } $kiwi -> info ("Creating $format image..."); $target =~ s/\.raw$/\.$format/; $convert = "convert -f raw $source -O $format"; @@ -399,6 +418,17 @@ return; } $kiwi -> done (); + $kiwi -> info ("Updating VMDK metadata\n"); + if (! $tools_version) { + $kiwi -> warning ("--> No VM tools version detected"); + $kiwi -> skipped(); + } else { + $kiwi -> info ("--> Setting tools version: $tools_version\n"); + $kiwi -> info ("--> Setting tools install type: $tools_install_type\n"); + $this -> __update_vmdk_descriptor( + $target, $tools_version, $tools_install_type + ); + } return $target; } @@ -1498,6 +1528,47 @@ return $qemu_img; } #========================================== +# __update_vmdk_descriptor +#------------------------------------------ +sub __update_vmdk_descriptor { + my $this = shift; + my $vmdk = shift; + my $ddb_tools_version = shift; + my $ddb_install_type = shift; + my $kiwi = $this->{kiwi}; + my $data = KIWIQX::qxx ("dd if=$vmdk bs=1 count=1024 skip=512 2>/dev/null"); + my $code = $? >> 8; + if ($code != 0) { + $kiwi -> error ("failed to read vmdk descriptor"); + $kiwi -> failed (); + return + } + my @descriptor_lines = split(/\n/, $data); + unshift (@descriptor_lines, 'encoding="UTF-8"'); + push (@descriptor_lines, "ddb.toolsInstallType = \"$ddb_install_type\""); + push (@descriptor_lines, "ddb.toolsVersion = \"$ddb_tools_version\""); + + $data = join("\n", @descriptor_lines); + + my $FD = FileHandle -> new(); + if (! $FD->open( + "|dd of=$vmdk bs=1 seek=512 conv=sparse,notrunc 2>/dev/null") + ) { + $kiwi -> error ("failed to open vmdk descriptor: $!"); + $kiwi -> failed (); + return + } + print $FD $data; + $FD -> close(); + $code = $? >> 8; + if ($code != 0) { + $kiwi -> error ("failed to write vmdk descriptor"); + $kiwi -> failed (); + return + } + return $this; +} +#========================================== # Destructor #------------------------------------------ sub DESTROY { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIResult.pm new/kiwi/modules/KIWIResult.pm --- old/kiwi/modules/KIWIResult.pm 2015-09-10 15:20:52.000000000 +0200 +++ new/kiwi/modules/KIWIResult.pm 2015-11-17 12:53:24.000000000 +0100 @@ -398,15 +398,25 @@ my $buildinfo = $this->{buildinfo}; my $data; my $code; + my $ret; + my $install = 0; #========================================== # handle install media #------------------------------------------ if ($buildinfo->exists('main','install.iso')) { - return $this -> __bundleExtension ('install.iso'); - } elsif ($buildinfo->exists('main','install.stick')) { - return $this -> __bundleExtension ('install.raw'); - } elsif ($buildinfo->exists('main','install.pxe')) { - return $this -> __bundleExtension ('install.tar.xz'); + $install = 1; + $ret |= $this -> __bundleExtension ('install.iso'); + } + if ($buildinfo->exists('main','install.stick')) { + $install = 1; + $ret |= $this -> __bundleExtension ('install.raw'); + } + if ($buildinfo->exists('main','install.pxe')) { + $install = 1; + $ret |= $this -> __bundleExtension ('install.tar.xz'); + } + if ($install) { + return $ret; } #========================================== # handle formats 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-10-19 16:16:59.000000000 +0200 +++ new/kiwi/modules/KIWIRuntimeChecker.pm 2015-11-17 12:53:24.000000000 +0100 @@ -121,9 +121,6 @@ if (! $this -> __checkTargetLocation()) { return; } - if (! $this -> __checkMountDependencies()) { - return; - } if (! $this -> __checkCorrectRootFSPermissons()) { return; } @@ -216,9 +213,6 @@ if (! $this -> __checkTargetLocation()) { return; } - if (! $this -> __checkMountDependencies()) { - return; - } if (! $this -> __checkDeprecatedFilesystem()) { return; } @@ -1758,69 +1752,6 @@ } #========================================== -# __checkMountDependencies -#------------------------------------------ -sub __checkMountDependencies { - my $this = shift; - my $kiwi = $this->{kiwi}; - my $msg; - if ($ENV{KIWI_IGNORE_OLD_MOUNTS}) { - return 1; - } - my %proc_result; - foreach my $pid ($this->__read_pids('/proc')) { - foreach my $task_pid ($this->__read_pids("/proc/$pid/task")) { - my $TASK_MOUNTS = FileHandle->new(); - if ($TASK_MOUNTS->open("/proc/$pid/task/$task_pid/mounts")) { - while (my $line = <$TASK_MOUNTS>) { - # The search expression to indicate this mount belongs to - # some kiwi process is not 100% reliable, but so far the - # only solution I could come up with - if ($line =~ /kiwi/) { - $proc_result{$task_pid} = 1; - } - } - $TASK_MOUNTS->close(); - } - } - } - my @kiwi_mount_references = sort keys %proc_result; - if (! @kiwi_mount_references) { - return 1; - } - - $msg = <<' END_MESSAGE'; - It appears there are processes which are holding onto - mounts created by a previous run - END_MESSAGE - $kiwi->error($this->__here_format($msg)); - - my $PS = FileHandle->new(); - if ($PS->open("pstree -p|")) { - while (my $line = <$PS>) { - foreach my $ref_pid (@kiwi_mount_references) { - if ($line =~ /\($ref_pid\)/) { - $kiwi->note($line); - last; - } - } - } - $PS -> close(); - } - $kiwi->note("\n"); - - $msg = <<' END_MESSAGE'; - This could cause kiwi to fail, or even worse, if you are - building on tmpfs, it could totally freeze or crash your - machine. Please first clean up these old mounts, or export - 'KIWI_IGNORE_OLD_MOUNTS=yes' and re-run - END_MESSAGE - $kiwi->error($this->__here_format($msg)); - - return; -} - -#========================================== # __hasBootLoaderTools #------------------------------------------ sub __hasBootLoaderTools { 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-09-21 16:23:18.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rnc 2015-11-26 09:08:16.000000000 +0100 @@ -1783,7 +1783,7 @@ ## hybrid ISO is used as disk on e.g a USB Stick. By default ## the btrfs filesystem is used attribute hybridpersistent_filesystem { - "btrfs" | "fat" + "btrfs" | "fat" | "ext4" } k.type.image.attribute = ## Specifies the image type 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-09-21 16:23:18.000000000 +0200 +++ new/kiwi/modules/KIWISchema.rng 2015-11-26 09:08:25.000000000 +0100 @@ -2403,6 +2403,7 @@ <choice> <value>btrfs</value> <value>fat</value> + <value>ext4</value> </choice> </attribute> </define> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-leap-42.1-JeOS/config.xml new/kiwi/template/ix86/suse-leap-42.1-JeOS/config.xml --- old/kiwi/template/ix86/suse-leap-42.1-JeOS/config.xml 2015-10-19 11:46:05.000000000 +0200 +++ new/kiwi/template/ix86/suse-leap-42.1-JeOS/config.xml 2015-11-26 09:13:36.000000000 +0100 @@ -14,7 +14,7 @@ <profile name="vmxFlavour" description="VMX with default kernel" import="true"/> </profiles> <preferences> - <type image="iso" primary="true" boot="isoboot/suse-leap42.1" flags="overlay" hybrid="true" firmware="efi" kernelcmdline="splash"/> + <type image="iso" primary="true" boot="isoboot/suse-leap42.1" flags="overlay" hybrid="true" firmware="efi" kernelcmdline="splash" hybridpersistent_filesystem="ext4" hybridpersistent="true"/> <version>1.42.1</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale>
