Hello community, here is the log from the commit of package python-kiwi for openSUSE:Factory checked in at 2017-10-05 11:53:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kiwi (Old) and /work/SRC/openSUSE:Factory/.python-kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kiwi" Thu Oct 5 11:53:32 2017 rev:10 rq:529934 version:9.11.8 Changes: -------- --- /work/SRC/openSUSE:Factory/python-kiwi/python-kiwi.changes 2017-09-13 21:34:08.965993759 +0200 +++ /work/SRC/openSUSE:Factory/.python-kiwi.new/python-kiwi.changes 2017-10-05 11:53:39.767843164 +0200 @@ -1,0 +2,202 @@ +Fri Sep 29 15:04:59 CEST 2017 - [email protected] + +- Bump version: 9.11.7 → 9.11.8 + +------------------------------------------------------------------- +Fri Sep 29 10:24:05 CEST 2017 - [email protected] + +- Changed permissions of /srv/tftpboot to be readable (bsc#940608) + +------------------------------------------------------------------- +Thu Sep 28 15:41:24 CEST 2017 - [email protected] + +- Bump version: 9.11.6 → 9.11.7 + +------------------------------------------------------------------- +Thu Sep 28 14:41:16 CEST 2017 - [email protected] + +- Also handle multiple error conditions + +------------------------------------------------------------------- +Thu Sep 28 11:50:43 CEST 2017 - [email protected] + +- Allow to ignore certain isohybrid warnings + + kiwi treates warning from isohybrid as fatal errors becuase in + most cases they are fatal. However some of them are kind of + historical and should be ignored like the one described here: + http://www.syslinux.org/archives/2015-March/023306.html + +------------------------------------------------------------------- +Wed Sep 27 14:52:07 CEST 2017 - [email protected] + +- Bump version: 9.11.5 → 9.11.6 + +------------------------------------------------------------------- +Wed Sep 27 12:06:04 CEST 2017 - [email protected] + +- Make sure xz options are used with pxe tarball + + The tar command used in the pxe builder did not utilize threading + and/or the xz options provided by an optional kiwi config file. + This Fixes #507 + +------------------------------------------------------------------- +Wed Sep 27 11:18:29 CEST 2017 - [email protected] + +- Move depmod into baseUpdateModuleDependencies + + Kernel module dependencies should be resolved after kiwi has + called all the stripping functions and not as part of the + baseCreateCommonKernelFile which runs before. + This Fixes #508 + +------------------------------------------------------------------- +Tue Sep 26 16:21:49 CEST 2017 - [email protected] + +- Fixed order of volume mount list + + re-order mount_list by mountpoint hierarchy. This is needed + because the handling of the fullsize volume and all other + volumes is outside of the canonical order. If the fullsize + volume forms a nested structure together with another + volume the volume mount list must be re-ordered to avoid + mounting the volumes in the wrong order + +------------------------------------------------------------------- +Mon Sep 25 16:53:27 CEST 2017 - [email protected] + +- Update issue template + +------------------------------------------------------------------- +Fri Sep 22 15:55:28 CEST 2017 - [email protected] + +- Bump version: 9.11.4 → 9.11.5 + +------------------------------------------------------------------- +Fri Sep 22 15:53:43 CEST 2017 - [email protected] + +- Rebuild schema documentation + +------------------------------------------------------------------- +Thu Sep 21 12:34:55 CEST 2017 - [email protected] + +- Show results in a dialog + +------------------------------------------------------------------- +Wed Sep 20 15:18:09 CEST 2017 - [email protected] + +- Improve display of runMediaCheck results + + The splash screen should be switched off in order to let the + user see the mediacheck results as well as a delay timeout + before the boot continues or stops is useful + +------------------------------------------------------------------- +Wed Sep 20 15:15:45 CEST 2017 - [email protected] + +- Call plymouth default theme setup in build command + + Make sure plymouth-set-default-theme is called as part + of the system build command and not only as part of the + system prepare command + +------------------------------------------------------------------- +Tue Sep 19 16:09:18 CEST 2017 - [email protected] + +- Fixed package requires for dracut-kiwi-live + + On Fedora/RHEL cdrkit is only a source package building other + packages. The package dracut-kiwi-live really needs is + genisoimage + +------------------------------------------------------------------- +Mon Sep 18 14:35:23 CEST 2017 - [email protected] + +- Fix trailing pipe character in .packages file + + In addition make sure the field layout is consistent across + the .packages files no matter which package manager was used + to create the information. This Fixes #501 + +------------------------------------------------------------------- +Fri Sep 15 10:02:49 CEST 2017 - [email protected] + +- Bump version: 9.11.3 → 9.11.4 + +------------------------------------------------------------------- +Fri Sep 15 10:00:36 CEST 2017 - [email protected] + +- Update documentation + + Link to the obs overview page to show build test results + +------------------------------------------------------------------- +Fri Sep 15 09:56:27 CEST 2017 - [email protected] + +- Added Fedora integration test build to obs status + +------------------------------------------------------------------- +Fri Sep 15 09:00:29 CEST 2017 - [email protected] + +- Limit the characters set for volid attribute + + This commit fixes #493 + +------------------------------------------------------------------- +Thu Sep 14 19:35:08 CEST 2017 - [email protected] + +- Revert "Fixed package requires" + + This reverts commit a8d50a593911725965e09b0e8c2f3b9bc742202b. + +------------------------------------------------------------------- +Thu Sep 14 18:28:06 CEST 2017 - [email protected] + +- Fixed package requires + + On Fedora xattr is provided by python[3]-pyxattr + +------------------------------------------------------------------- +Thu Sep 14 18:10:52 CEST 2017 - [email protected] + +- kiwi-boot-requires only required for suse(obs) + +------------------------------------------------------------------- +Thu Sep 14 10:27:20 CEST 2017 - [email protected] + +- Update project intro page + +------------------------------------------------------------------- +Thu Sep 14 10:16:40 CEST 2017 - [email protected] + +- Update project intro layout + +------------------------------------------------------------------- +Thu Sep 14 10:14:24 CEST 2017 - [email protected] + +- Update project intro page + +------------------------------------------------------------------- +Wed Sep 13 09:27:51 CEST 2017 - [email protected] + +- Bump version: 9.11.2 → 9.11.3 + +------------------------------------------------------------------- +Tue Sep 12 15:30:49 CEST 2017 - [email protected] + +- Added disk format="vhdx" support + + Support dynamic VHDX (gen2) image format for Hyper-V. + This Fixes #490 + +------------------------------------------------------------------- +Tue Sep 12 12:24:31 CEST 2017 - [email protected] + +- Added additional required attr schematron rule + ++++ 5 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/python-kiwi/python-kiwi.changes ++++ and /work/SRC/openSUSE:Factory/.python-kiwi.new/python-kiwi.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kiwi.spec ++++++ --- /var/tmp/diff_new_pack.c6eJCh/_old 2017-10-05 11:53:45.271068833 +0200 +++ /var/tmp/diff_new_pack.c6eJCh/_new 2017-10-05 11:53:45.275068270 +0200 @@ -93,7 +93,7 @@ %endif Name: python-kiwi -Version: 9.11.2 +Version: 9.11.8 Release: 0 Provides: kiwi-schema = 6.6 Url: https://github.com/SUSE/kiwi @@ -310,12 +310,13 @@ Summary: KIWI - Dracut module for iso(live) image type Group: System/Management BuildRequires: dracut +Requires: dialog Requires: dracut Requires: e2fsprogs Requires: util-linux Requires: xfsprogs %if 0%{?fedora} || 0%{?rhel} -Requires: cdrkit +Requires: genisoimage %else Requires: cdrkit-cdrtools-compat %endif @@ -336,6 +337,7 @@ for booting vmx images built with KIWI and configured to use an overlay root filesystem +%if 0%{?suse_version} %package -n kiwi-boot-requires Summary: KIWI - buildservice package requirements for boot images Group: System/Management @@ -366,6 +368,7 @@ kiwi to build the boot image. This package must never be published nor installed by anybody else except for the buildservice, it is part of the kiwi - buildservice integration exclusively +%endif %package -n kiwi-man-pages Summary: KIWI - manual pages @@ -535,7 +538,7 @@ %ifarch %ix86 x86_64 %files -n kiwi-pxeboot %defattr(-, root, root) -%dir %attr(0750,tftp,tftp) /srv/tftpboot +%dir %attr(0755,tftp,tftp) /srv/tftpboot %dir /srv/tftpboot/KIWI %dir /srv/tftpboot/pxelinux.cfg %dir /srv/tftpboot/image @@ -543,7 +546,9 @@ %dir /srv/tftpboot/boot %endif +%if 0%{?suse_version} %files -n kiwi-boot-requires %defattr(-, root, root) +%endif %changelog ++++++ python-kiwi.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/.bumpversion.cfg new/kiwi-9.11.8/.bumpversion.cfg --- old/kiwi-9.11.2/.bumpversion.cfg 2017-09-11 17:03:55.000000000 +0200 +++ new/kiwi-9.11.8/.bumpversion.cfg 2017-09-29 15:04:59.000000000 +0200 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 9.11.2 +current_version = 9.11.8 commit = True tag = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/PKG-INFO new/kiwi-9.11.8/PKG-INFO --- old/kiwi-9.11.2/PKG-INFO 2017-09-11 17:15:37.000000000 +0200 +++ new/kiwi-9.11.8/PKG-INFO 2017-09-29 15:10:11.000000000 +0200 @@ -1,12 +1,13 @@ Metadata-Version: 1.1 Name: kiwi -Version: 9.11.2 +Version: 9.11.8 Summary: KIWI - Appliance Builder (next generation) Home-page: http://suse.github.io/kiwi Author: Marcus Schaefer Author-email: [email protected] License: UNKNOWN Download-URL: http://suse.github.io/kiwi +Description-Content-Type: UNKNOWN Description: UNKNOWN Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/README.rst new/kiwi-9.11.8/README.rst --- old/kiwi-9.11.2/README.rst 2017-09-04 15:59:29.000000000 +0200 +++ new/kiwi-9.11.8/README.rst 2017-09-15 10:37:16.000000000 +0200 @@ -6,20 +6,21 @@ .. |Health| image:: https://landscape.io/github/SUSE/kiwi/master/landscape.svg?style=flat :target: https://landscape.io/github/SUSE/kiwi/master .. |Doc| replace:: `Documentation <https://suse.github.io/kiwi>`__ +.. |Installation| replace:: `Installation <https://suse.github.io/kiwi/quickstart.html>`__ +.. |Contributing| replace:: `Contributing <https://suse.github.io/kiwi/contributing.html>`__ +.. |Donate| image:: https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif + :target: https://www.paypal.me/SchaeferMarcus |Build Status| |Health| -.. topic:: Abstract +**KIWI, the OS image and appliance builder.** - KIWI, the OS image and appliance builder. +* |Installation| - -* `Installation <https://suse.github.io/kiwi/quickstart.html>`__ - -* `Contributing <https://suse.github.io/kiwi/contributing.html>`__ +* |Contributing| * |Doc| +If this project reduced your development time feel free to buy me a coffee. - - +|Donate| Binary files old/kiwi-9.11.2/boot_arch.tgz and new/kiwi-9.11.8/boot_arch.tgz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/doc/build/man/kiwi.8 new/kiwi-9.11.8/doc/build/man/kiwi.8 --- old/kiwi-9.11.2/doc/build/man/kiwi.8 2017-09-11 17:15:36.000000000 +0200 +++ new/kiwi-9.11.8/doc/build/man/kiwi.8 2017-09-29 15:10:07.000000000 +0200 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI" "8" "Sep 11, 2017" "9.11.2" "kiwi" +.TH "KIWI" "8" "Sep 29, 2017" "9.11.8" "kiwi" .SH NAME kiwi \- Creating Operating System Images . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/doc/build/man/kiwi::image::info.8 new/kiwi-9.11.8/doc/build/man/kiwi::image::info.8 --- old/kiwi-9.11.2/doc/build/man/kiwi::image::info.8 2017-09-11 17:15:36.000000000 +0200 +++ new/kiwi-9.11.8/doc/build/man/kiwi::image::info.8 2017-09-29 15:10:07.000000000 +0200 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::IMAGE::INFO" "8" "Sep 11, 2017" "9.11.2" "kiwi" +.TH "KIWI::IMAGE::INFO" "8" "Sep 29, 2017" "9.11.8" "kiwi" .SH NAME kiwi::image::info \- Provide detailed information about an image description . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/doc/build/man/kiwi::image::resize.8 new/kiwi-9.11.8/doc/build/man/kiwi::image::resize.8 --- old/kiwi-9.11.2/doc/build/man/kiwi::image::resize.8 2017-09-11 17:15:36.000000000 +0200 +++ new/kiwi-9.11.8/doc/build/man/kiwi::image::resize.8 2017-09-29 15:10:07.000000000 +0200 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::IMAGE::RESIZE" "8" "Sep 11, 2017" "9.11.2" "kiwi" +.TH "KIWI::IMAGE::RESIZE" "8" "Sep 29, 2017" "9.11.8" "kiwi" .SH NAME kiwi::image::resize \- Resize disk images to new geometry . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/doc/build/man/kiwi::result::bundle.8 new/kiwi-9.11.8/doc/build/man/kiwi::result::bundle.8 --- old/kiwi-9.11.2/doc/build/man/kiwi::result::bundle.8 2017-09-11 17:15:36.000000000 +0200 +++ new/kiwi-9.11.8/doc/build/man/kiwi::result::bundle.8 2017-09-29 15:10:07.000000000 +0200 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::RESULT::BUNDLE" "8" "Sep 11, 2017" "9.11.2" "kiwi" +.TH "KIWI::RESULT::BUNDLE" "8" "Sep 29, 2017" "9.11.8" "kiwi" .SH NAME kiwi::result::bundle \- Bundle build results . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/doc/build/man/kiwi::result::list.8 new/kiwi-9.11.8/doc/build/man/kiwi::result::list.8 --- old/kiwi-9.11.2/doc/build/man/kiwi::result::list.8 2017-09-11 17:15:36.000000000 +0200 +++ new/kiwi-9.11.8/doc/build/man/kiwi::result::list.8 2017-09-29 15:10:07.000000000 +0200 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::RESULT::LIST" "8" "Sep 11, 2017" "9.11.2" "kiwi" +.TH "KIWI::RESULT::LIST" "8" "Sep 29, 2017" "9.11.8" "kiwi" .SH NAME kiwi::result::list \- List build results . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/doc/build/man/kiwi::system::build.8 new/kiwi-9.11.8/doc/build/man/kiwi::system::build.8 --- old/kiwi-9.11.2/doc/build/man/kiwi::system::build.8 2017-09-11 17:15:36.000000000 +0200 +++ new/kiwi-9.11.8/doc/build/man/kiwi::system::build.8 2017-09-29 15:10:07.000000000 +0200 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::SYSTEM::BUILD" "8" "Sep 11, 2017" "9.11.2" "kiwi" +.TH "KIWI::SYSTEM::BUILD" "8" "Sep 29, 2017" "9.11.8" "kiwi" .SH NAME kiwi::system::build \- Build image in combined prepare and create step . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/doc/build/man/kiwi::system::create.8 new/kiwi-9.11.8/doc/build/man/kiwi::system::create.8 --- old/kiwi-9.11.2/doc/build/man/kiwi::system::create.8 2017-09-11 17:15:36.000000000 +0200 +++ new/kiwi-9.11.8/doc/build/man/kiwi::system::create.8 2017-09-29 15:10:07.000000000 +0200 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::SYSTEM::CREATE" "8" "Sep 11, 2017" "9.11.2" "kiwi" +.TH "KIWI::SYSTEM::CREATE" "8" "Sep 29, 2017" "9.11.8" "kiwi" .SH NAME kiwi::system::create \- Create image from prepared root system . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/doc/build/man/kiwi::system::prepare.8 new/kiwi-9.11.8/doc/build/man/kiwi::system::prepare.8 --- old/kiwi-9.11.2/doc/build/man/kiwi::system::prepare.8 2017-09-11 17:15:36.000000000 +0200 +++ new/kiwi-9.11.8/doc/build/man/kiwi::system::prepare.8 2017-09-29 15:10:07.000000000 +0200 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::SYSTEM::PREPARE" "8" "Sep 11, 2017" "9.11.2" "kiwi" +.TH "KIWI::SYSTEM::PREPARE" "8" "Sep 29, 2017" "9.11.8" "kiwi" .SH NAME kiwi::system::prepare \- Prepare image root system . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/doc/build/man/kiwi::system::update.8 new/kiwi-9.11.8/doc/build/man/kiwi::system::update.8 --- old/kiwi-9.11.2/doc/build/man/kiwi::system::update.8 2017-09-11 17:15:36.000000000 +0200 +++ new/kiwi-9.11.8/doc/build/man/kiwi::system::update.8 2017-09-29 15:10:07.000000000 +0200 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "KIWI::SYSTEM::UPDATE" "8" "Sep 11, 2017" "9.11.2" "kiwi" +.TH "KIWI::SYSTEM::UPDATE" "8" "Sep 29, 2017" "9.11.8" "kiwi" .SH NAME kiwi::system::update \- Update/Upgrade image root system . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/doc/source/conf.py new/kiwi-9.11.8/doc/source/conf.py --- old/kiwi-9.11.2/doc/source/conf.py 2017-09-11 17:03:55.000000000 +0200 +++ new/kiwi-9.11.8/doc/source/conf.py 2017-09-29 15:04:59.000000000 +0200 @@ -93,7 +93,7 @@ # built documents. # # The short X.Y version. -version = u'9.11.2' +version = u'9.11.8' # The full version, including alpha/beta/rc tags. release = version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/doc/source/index.rst new/kiwi-9.11.8/doc/source/index.rst --- old/kiwi-9.11.2/doc/source/index.rst 2017-06-29 13:47:12.000000000 +0200 +++ new/kiwi-9.11.8/doc/source/index.rst 2017-09-15 10:37:16.000000000 +0200 @@ -11,7 +11,9 @@ * `GitHub Sources <https://github.com/SUSE/kiwi>`__ * `GitHub Releases <https://github.com/SUSE/kiwi/releases>`__ * `RPM Packages <http://download.opensuse.org/repositories/Virtualization:/Appliances:/Builder>`__ - * `Build Tests <https://ci.opensuse.org/view/kiwi/>`__ + * `Build Tests(x86) <https://build.opensuse.org/project/show/Virtualization:Appliances:Images:Testing_x86>`__ + * `Build Tests(arm) <https://build.opensuse.org/project/show/Virtualization:Appliances:Images:Testing_arm>`__ + * `Build Tests(s390) <https://build.opensuse.org/project/show/Virtualization:Appliances:Images:Testing_s390>`__ .. toctree:: :maxdepth: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/dracut/modules.d/90kiwi-live/kiwi-live-lib.sh new/kiwi-9.11.8/dracut/modules.d/90kiwi-live/kiwi-live-lib.sh --- old/kiwi-9.11.2/dracut/modules.d/90kiwi-live/kiwi-live-lib.sh 2017-09-11 16:50:37.000000000 +0200 +++ new/kiwi-9.11.8/dracut/modules.d/90kiwi-live/kiwi-live-lib.sh 2017-09-21 13:52:36.000000000 +0200 @@ -122,9 +122,60 @@ # to see the check results during boot if ! command -v checkmedia &>/dev/null; then echo "No mediacheck program installed, mediacheck skipped" 1>&2 - elif ! checkmedia ${media_check_device} 1>&2;then - die "ISO check failed" + return + fi + local timeout=20 + local check_result=/run/initramfs/checkmedia.result + checkmedia ${media_check_device} &>${check_result} + local check_status=$? + if [ ${check_status} != 0 ];then + echo "ISO check failed" >> ${check_result} else - echo "ISO check passed" 1>&2 + echo "ISO check passed" >> ${check_result} + fi + echo "Press key to continue (waiting ${timeout}sec...)" >> ${check_result} + _run_dialog --timeout ${timeout} --textbox ${check_result} 20 70 + if [ ${check_status} != 0 ];then + die "Failed to verify system integrity" fi } + +#========================================= +# Methods considered private +#----------------------------------------- +function _setup_interactive_service { + local service=/usr/lib/systemd/system/dracut-run-interactive.service + [ -e ${service} ] && return + { + echo "[Unit]" + echo "Description=Dracut Run Interactive" + echo "DefaultDependencies=no" + echo "After=systemd-vconsole-setup.service" + echo "Wants=systemd-vconsole-setup.service" + echo "Conflicts=emergency.service emergency.target" + echo "[Service]" + echo "Environment=HOME=/" + echo "Environment=DRACUT_SYSTEMD=1" + echo "Environment=NEWROOT=/sysroot" + echo "WorkingDirectory=/" + echo "ExecStart=/bin/bash /bin/dracut-interactive" + echo "Type=oneshot" + echo "StandardInput=tty-force" + echo "StandardOutput=inherit" + echo "StandardError=inherit" + echo "KillMode=process" + echo "IgnoreSIGPIPE=no" + echo "TaskMax=infinity" + echo "KillSignal=SIGHUP" + } > ${service} +} + +function _run_interactive { + _setup_interactive_service + systemctl start dracut-run-interactive.service +} + +function _run_dialog { + echo "dialog $@" >/bin/dracut-interactive + _run_interactive +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/dracut/modules.d/90kiwi-live/module-setup.sh new/kiwi-9.11.8/dracut/modules.d/90kiwi-live/module-setup.sh --- old/kiwi-9.11.2/dracut/modules.d/90kiwi-live/module-setup.sh 2017-09-11 16:50:37.000000000 +0200 +++ new/kiwi-9.11.8/dracut/modules.d/90kiwi-live/module-setup.sh 2017-09-21 13:52:36.000000000 +0200 @@ -23,7 +23,7 @@ inst_multiple \ umount dmsetup blockdev blkid lsblk dd losetup \ isoinfo grep cut partprobe find wc fdisk tail mkfs.ext4 mkfs.xfs \ - checkmedia + checkmedia dialog inst_hook cmdline 30 "$moddir/parse-kiwi-live.sh" inst_hook pre-udev 30 "$moddir/kiwi-live-genrules.sh" inst_hook pre-mount 30 "$moddir/kiwi-live-checkmedia.sh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/bootloader/template/grub2.py new/kiwi-9.11.8/kiwi/bootloader/template/grub2.py --- old/kiwi-9.11.2/kiwi/bootloader/template/grub2.py 2017-09-11 16:50:37.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/bootloader/template/grub2.py 2017-09-21 13:52:36.000000000 +0200 @@ -237,7 +237,7 @@ menuentry "Mediacheck" --class os --unrestricted { set gfxpayload=keep echo Loading kernel... - $$linux ($$root)${bootpath}/${kernel_file} mediacheck=1 ${boot_options} + $$linux ($$root)${bootpath}/${kernel_file} mediacheck=1 plymouth.enable=0 ${boot_options} echo Loading initrd... $$initrd ($$root)${bootpath}/${initrd_file} } @@ -249,7 +249,7 @@ echo Loading hypervisor... multiboot ${bootpath}/${hypervisor} dummy echo Loading kernel... - module ${bootpath}/${kernel_file} dummy mediacheck=1 ${failsafe_boot_options} + module ${bootpath}/${kernel_file} dummy mediacheck=1 plymouth.enable=0 ${failsafe_boot_options} echo Loading initrd... module ${bootpath}/${initrd_file} dummy } @@ -259,7 +259,7 @@ menuentry "Mediacheck" --class os --unrestricted { set gfxpayload=keep echo Loading kernel... - linux ($$root)${bootpath}/${kernel_file} mediacheck=1 ${boot_options} + linux ($$root)${bootpath}/${kernel_file} mediacheck=1 plymouth.enable=0 ${boot_options} echo Loading initrd... initrd ($$root)${bootpath}/${initrd_file} } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/bootloader/template/isolinux.py new/kiwi-9.11.8/kiwi/bootloader/template/isolinux.py --- old/kiwi-9.11.2/kiwi/bootloader/template/isolinux.py 2017-09-11 16:50:37.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/bootloader/template/isolinux.py 2017-09-21 13:52:36.000000000 +0200 @@ -77,61 +77,61 @@ self.menu_install_entry_multiboot = dedent(''' label Install_${title} kernel mboot.c32 - append ${hypervisor} --- ${kernel_file} ${boot_options} cdinst=1 kiwi_hybrid=1 showopts --- ${initrd_file} showopts + append ${hypervisor} --- ${kernel_file} ${boot_options} cdinst=1 showopts --- ${initrd_file} showopts ''').strip() + self.cr self.menu_install_entry_failsafe_multiboot = dedent(''' label Failsafe_--_Install_${title} kernel mboot.c32 - append ${hypervisor} --- ${kernel_file} ${failsafe_boot_options} cdinst=1 kiwi_hybrid=1 showopts --- ${initrd_file} showopts + append ${hypervisor} --- ${kernel_file} ${failsafe_boot_options} cdinst=1 showopts --- ${initrd_file} showopts ''').strip() + self.cr self.menu_entry_multiboot = dedent(''' label ${title} kernel mboot.c32 - append ${hypervisor} --- ${kernel_file} ${boot_options} kiwi_hybrid=1 showopts --- ${initrd_file} showopts + append ${hypervisor} --- ${kernel_file} ${boot_options} showopts --- ${initrd_file} showopts ''').strip() + self.cr self.menu_entry_failsafe_multiboot = dedent(''' label Failsafe_--_${title} kernel mboot.c32 - append ${hypervisor} --- ${kernel_file} ${failsafe_boot_options} kiwi_hybrid=1 showopts --- ${initrd_file} showopts + append ${hypervisor} --- ${kernel_file} ${failsafe_boot_options} showopts --- ${initrd_file} showopts ''').strip() + self.cr self.menu_mediacheck_entry_multiboot = dedent(''' label Mediacheck kernel mboot.c32 - append ${hypervisor} --- ${kernel_file} ${boot_options} mediacheck=1 kiwi_hybrid=1 showopts --- ${initrd_file} showopts + append ${hypervisor} --- ${kernel_file} ${boot_options} mediacheck=1 plymouth.enable=0 showopts --- ${initrd_file} showopts ''').strip() + self.cr self.menu_install_entry = dedent(''' label Install_${title} kernel ${kernel_file} - append initrd=${initrd_file} ${boot_options} cdinst=1 kiwi_hybrid=1 showopts + append initrd=${initrd_file} ${boot_options} cdinst=1 showopts ''').strip() + self.cr self.menu_install_entry_failsafe = dedent(''' label Failsafe_--_Install_${title} kernel ${kernel_file} - append initrd=${initrd_file} ${failsafe_boot_options} cdinst=1 kiwi_hybrid=1 showopts + append initrd=${initrd_file} ${failsafe_boot_options} cdinst=1 showopts ''').strip() + self.cr self.menu_entry = dedent(''' label ${title} kernel ${kernel_file} - append initrd=${initrd_file} ${boot_options} kiwi_hybrid=1 showopts + append initrd=${initrd_file} ${boot_options} showopts ''').strip() + self.cr self.menu_entry_failsafe = dedent(''' label Failsafe_--_${title} kernel ${kernel_file} - append initrd=${initrd_file} ${failsafe_boot_options} kiwi_hybrid=1 showopts + append initrd=${initrd_file} ${failsafe_boot_options} showopts ''').strip() + self.cr self.menu_mediacheck_entry = dedent(''' label Mediacheck kernel ${kernel_file} - append initrd=${initrd_file} ${boot_options} mediacheck=1 kiwi_hybrid=1 showopts + append initrd=${initrd_file} ${boot_options} mediacheck=1 plymouth.enable=0 showopts ''').strip() + self.cr def get_install_message_template(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/builder/pxe.py new/kiwi-9.11.8/kiwi/builder/pxe.py --- old/kiwi-9.11.2/kiwi/builder/pxe.py 2017-08-03 11:00:42.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/builder/pxe.py 2017-09-27 14:50:37.000000000 +0200 @@ -19,6 +19,7 @@ import platform # project +from kiwi.defaults import Defaults from kiwi.command import Command from kiwi.boot.image import BootImage from kiwi.builder.filesystem import FileSystemBuilder @@ -172,15 +173,21 @@ self.boot_image_task.create_initrd() # put results into a tarball - Command.run( - [ - 'tar', '-C', self.target_dir, '-cJf', self.archive_name, - self.kernel_filename, - os.path.basename(self.boot_image_task.initrd_filename), - os.path.basename(self.image), - os.path.basename(self.filesystem_checksum) - ] - ) + if not self.xz_options: + self.xz_options = Defaults.get_xz_compression_options() + bash_command = [ + 'tar', '-C', self.target_dir, '-c', '--to-stdout' + ] + [ + self.kernel_filename, + os.path.basename(self.boot_image_task.initrd_filename), + os.path.basename(self.image), + os.path.basename(self.filesystem_checksum) + ] + [ + '|', 'xz', '-f' + ] + self.xz_options + [ + '>', self.archive_name + ] + Command.run(['bash', '-c', ' '.join(bash_command)]) # store results self.result.add( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/config/functions.sh new/kiwi-9.11.8/kiwi/config/functions.sh --- old/kiwi-9.11.2/kiwi/config/functions.sh 2017-09-07 15:58:59.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/config/functions.sh 2017-09-27 14:50:37.000000000 +0200 @@ -1135,6 +1135,21 @@ } #====================================== +# baseUpdateModuleDependencies +#-------------------------------------- +function baseUpdateModuleDependencies { + local kernel_dir + for kernel_dir in /lib/modules/*;do + [ -d "${kernel_dir}" ] || continue + local kernel_version=$(/usr/bin/basename ${kernel_dir}) + if [ -f /boot/System.map-${kernel_version} ];then + /sbin/depmod -F \ + /boot/System.map-${kernel_version} ${kernel_version} + fi + done +} + +#====================================== # baseCreateCommonKernelFile #-------------------------------------- function baseCreateCommonKernelFile { @@ -1178,15 +1193,6 @@ fi kernel_version=$(/usr/bin/basename $kernel_dir) #========================================== - # run depmod, deps should be up to date - #------------------------------------------ - if [ ! -f /boot/System.map-$kernel_version ];then - # no system map for this kernel - echo "no system map for kernel: $kernel_name found... skip it" - continue - fi - /sbin/depmod -F /boot/System.map-$kernel_version $kernel_version - #========================================== # create common kernel files, last wins ! #------------------------------------------ pushd /boot @@ -1272,6 +1278,7 @@ baseSyncKernelTree baseStripModules baseStripFirmware + baseUpdateModuleDependencies fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/defaults.py new/kiwi-9.11.8/kiwi/defaults.py --- old/kiwi-9.11.2/kiwi/defaults.py 2017-09-06 16:51:04.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/defaults.py 2017-09-15 10:37:16.000000000 +0200 @@ -511,7 +511,7 @@ :rtype: list """ return [ - 'gce', 'qcow2', 'vmdk', 'vmx', 'vhd', + 'gce', 'qcow2', 'vmdk', 'vmx', 'vhd', 'vhdx', 'vhdfixed', 'vdi', 'vagrant.libvirt.box' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/iso.py new/kiwi-9.11.8/kiwi/iso.py --- old/kiwi-9.11.2/kiwi/iso.py 2017-09-06 09:57:10.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/iso.py 2017-09-28 15:41:15.000000000 +0200 @@ -99,6 +99,11 @@ :param string mbrid: boot record id :param string isofile: path to the ISO file """ + ignore_errors = [ + # we ignore this error message, for details see: + # http://www.syslinux.org/archives/2015-March/023306.html + 'Warning: more than 1024 cylinders' + ] isohybrid_parameters = [ '--offset', format(offset), '--id', mbrid.get_id(), @@ -110,15 +115,21 @@ ['isohybrid'] + isohybrid_parameters + [isofile] ) # isohybrid warning messages on stderr should be treated - # as fatal errors because unexpected after effects might - # happen if e.g a gpt partition should be embedded but - # only a warning appears if isohybrid can't find an efi - # loader. Thus we are more strict and fail on any message - # on stderr + # as fatal errors except for the ones we want to ignore + # because unexpected after effects might happen if e.g a + # gpt partition should be embedded but only a warning + # appears if isohybrid can't find an efi loader. Thus we + # are more strict and fail if isohybrid_call.error: - raise KiwiCommandError( - 'isohybrid: {0}'.format(isohybrid_call.error) - ) + error_list = isohybrid_call.error.split(os.linesep) + for error in error_list: + for ignore_error in ignore_errors: + if ignore_error in error: + error_list.remove(error) + if error_list: + raise KiwiCommandError( + 'isohybrid: {0}'.format(isohybrid_call.error) + ) @classmethod def set_media_tag(self, isofile): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/schema/kiwi.rnc new/kiwi-9.11.8/kiwi/schema/kiwi.rnc --- old/kiwi-9.11.2/kiwi/schema/kiwi.rnc 2017-09-07 15:58:59.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/schema/kiwi.rnc 2017-09-15 10:37:16.000000000 +0200 @@ -24,7 +24,7 @@ namespace sch = "http://purl.oclc.org/dsdl/schematron"; namespace nul = "" -image-name = xsd:token {pattern = "[a-zA-Z0-9_\-\.]+"} +safe-posix-name = xsd:token {pattern = "[a-zA-Z0-9_\-\.]+"} locale-name = xsd:token {pattern = "[a-z]{2}_[A-Z]{2}(,[a-z]{2}_[A-Z]{2})*"} mac-address-type = xsd:token {pattern = "([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}"} size-type = xsd:token {pattern = "\d*|image"} @@ -146,7 +146,7 @@ attribute username { text } k.imagename.attribute = ## An image name without / and spaces - attribute name { image-name } + attribute name { safe-posix-name } k.clear.attribute = ## Specifies to clear or not some data or configurations attribute clear { xsd:boolean } @@ -1156,6 +1156,18 @@ ] ] ] + sch:pattern [ + abstract = "true" + id = "image_type_requirement" + sch:rule [ + context = "type[contains('$types', @image)]" + sch:assert [ + test = "@$attr" + "$attr attribute must be set for the following "~ + "image types: $types" + ] + ] + ] k.type.boot.attribute = ## Specifies the path of the boot image (initrd) description ## provided with KIWI @@ -1349,6 +1361,11 @@ sch:param [ name = "attr" value = "filesystem" ] sch:param [ name = "types" value = "vmx oem pxe" ] ] + >> sch:pattern [ + id = "filesystem_mandatory" is-a = "image_type_requirement" + sch:param [ name = "attr" value = "filesystem" ] + sch:param [ name = "types" value = "vmx oem pxe" ] + ] k.type.overlayroot.attribute = ## Specifies to use an overlay root system consisting ## out of a squashfs compressed read-only root system @@ -1410,7 +1427,7 @@ ## Specifies the format of the virtual disk. attribute format { "gce" | "ovf" | "ova" | "qcow2" | "vagrant" | "vmdk" | - "vdi" | "vhd" | "vhd-fixed" + "vdi" | "vhd" | "vhdx" | "vhd-fixed" } >> sch:pattern [ id = "format" is-a = "image_type" sch:param [ name = "attr" value = "format" ] @@ -1634,7 +1651,7 @@ ## for the iso type only: ## Specifies the volume ID (volume name or label) to be written ## into the master block. There is space for 32 characters. - attribute volid { text } + attribute volid { safe-posix-name } >> sch:pattern [ id = "volid" is-a = "image_type" sch:param [ name = "attr" value = "volid" ] sch:param [ name = "types" value = "iso" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/schema/kiwi.rng new/kiwi-9.11.8/kiwi/schema/kiwi.rng --- old/kiwi-9.11.2/kiwi/schema/kiwi.rng 2017-09-07 15:58:59.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/schema/kiwi.rng 2017-09-15 10:37:16.000000000 +0200 @@ -21,7 +21,7 @@ **************** --> <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"; xmlns:sch="http://purl.oclc.org/dsdl/schematron"; xmlns:rng="http://relaxng.org/ns/structure/1.0"; xmlns:db="http://docbook.org/ns/docbook"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://relaxng.org/ns/structure/1.0"; datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";> - <define name="image-name"> + <define name="safe-posix-name"> <data type="token"> <param name="pattern">[a-zA-Z0-9_\-\.]+</param> </data> @@ -272,7 +272,7 @@ <define name="k.imagename.attribute"> <attribute name="name"> <a:documentation>An image name without / and spaces</a:documentation> - <ref name="image-name"/> + <ref name="safe-posix-name"/> </attribute> </define> <define name="k.clear.attribute"> @@ -1766,6 +1766,11 @@ <sch:assert test="contains('$types', @image)">$attr attribute is only available for the following image types: $types</sch:assert> </sch:rule> </sch:pattern> + <sch:pattern abstract="true" id="image_type_requirement"> + <sch:rule context="type[contains('$types', @image)]"> + <sch:assert test="@$attr">$attr attribute must be set for the following image types: $types</sch:assert> + </sch:rule> + </sch:pattern> <define name="k.type.boot.attribute"> <attribute name="boot"> <a:documentation>Specifies the path of the boot image (initrd) description @@ -2030,6 +2035,10 @@ <sch:param name="attr" value="filesystem"/> <sch:param name="types" value="vmx oem pxe"/> </sch:pattern> + <sch:pattern id="filesystem_mandatory" is-a="image_type_requirement"> + <sch:param name="attr" value="filesystem"/> + <sch:param name="types" value="vmx oem pxe"/> + </sch:pattern> </define> <define name="k.type.overlayroot.attribute"> <attribute name="overlayroot"> @@ -2122,6 +2131,7 @@ <value>vmdk</value> <value>vdi</value> <value>vhd</value> + <value>vhdx</value> <value>vhd-fixed</value> </choice> </attribute> @@ -2432,6 +2442,7 @@ <a:documentation>for the iso type only: Specifies the volume ID (volume name or label) to be written into the master block. There is space for 32 characters.</a:documentation> + <ref name="safe-posix-name"/> </attribute> <sch:pattern id="volid" is-a="image_type"> <sch:param name="attr" value="volid"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/storage/subformat/__init__.py new/kiwi-9.11.8/kiwi/storage/subformat/__init__.py --- old/kiwi-9.11.2/kiwi/storage/subformat/__init__.py 2017-08-21 09:31:41.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/storage/subformat/__init__.py 2017-09-15 10:37:16.000000000 +0200 @@ -18,6 +18,7 @@ # project from kiwi.storage.subformat.qcow2 import DiskFormatQcow2 from kiwi.storage.subformat.vhd import DiskFormatVhd +from kiwi.storage.subformat.vhdx import DiskFormatVhdx from kiwi.storage.subformat.vhdfixed import DiskFormatVhdFixed from kiwi.storage.subformat.vmdk import DiskFormatVmdk from kiwi.storage.subformat.gce import DiskFormatGce @@ -62,6 +63,10 @@ return DiskFormatVhd( xml_state, root_dir, target_dir, custom_args ) + elif name == 'vhdx': + return DiskFormatVhdx( + xml_state, root_dir, target_dir, custom_args + ) elif name == 'vhd-fixed': disk_tag = xml_state.build_type.get_vhdfixedtag() if disk_tag: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/storage/subformat/vhdx.py new/kiwi-9.11.8/kiwi/storage/subformat/vhdx.py --- old/kiwi-9.11.2/kiwi/storage/subformat/vhdx.py 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi-9.11.8/kiwi/storage/subformat/vhdx.py 2017-09-15 10:37:16.000000000 +0200 @@ -0,0 +1,57 @@ +# Copyright (c) 2015 SUSE Linux GmbH. All rights reserved. +# +# This file is part of kiwi. +# +# kiwi is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# kiwi is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with kiwi. If not, see <http://www.gnu.org/licenses/> +# +# project +from kiwi.storage.subformat.base import DiskFormatBase +from kiwi.command import Command + + +class DiskFormatVhdx(DiskFormatBase): + """ + Create vhdx image format in dynamic subformat + """ + def post_init(self, custom_args): + """ + vhdx disk format post initialization method + + Store qemu options as list from custom args dict + + Attributes + + * :attr:`options` + qemu format conversion options + + * :attr:`image_format` + disk format name: vhdx + """ + self.image_format = 'vhdx' + self.options = self.get_qemu_option_list(custom_args) + self.options.append('-o') + self.options.append('subformat=dynamic') + + def create_image_format(self): + """ + Create vhdx dynamic disk format + """ + Command.run( + [ + 'qemu-img', 'convert', '-f', 'raw', self.diskname, + '-O', 'vhdx' + ] + self.options + [ + self.get_target_name_for_format(self.image_format) + ] + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/system/setup.py new/kiwi-9.11.8/kiwi/system/setup.py --- old/kiwi-9.11.2/kiwi/system/setup.py 2017-08-03 11:00:43.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/system/setup.py 2017-09-19 11:16:53.000000000 +0200 @@ -841,10 +841,10 @@ 'rpm', '--root', self.root_dir, '-qa', '--qf', '|'.join( [ - '%{NAME}', '%{EPOCH}', '%{VERSION}', '%{RELEASE}', - '%{ARCH}', '%{DISTURL}', '\\n' + '%{NAME}', '%{EPOCH}', '%{VERSION}', + '%{RELEASE}', '%{ARCH}', '%{DISTURL}' ] - ) + ) + '\\n' ] ) with open(filename, 'w') as packages: @@ -856,7 +856,12 @@ [ 'dpkg-query', '--admindir', os.sep.join([self.root_dir, 'var/lib/dpkg']), '-W', '-f', - '${Package}|${Version}|${Architecture}\n' + '|'.join( + [ + '${Package}', 'None', '${Version}', + 'None', '${Architecture}', 'None' + ] + ) + '\\n' ] ) with open(filename, 'w') as packages: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/tasks/system_build.py new/kiwi-9.11.8/kiwi/tasks/system_build.py --- old/kiwi-9.11.2/kiwi/tasks/system_build.py 2017-09-07 15:58:59.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/tasks/system_build.py 2017-09-21 13:52:36.000000000 +0200 @@ -221,6 +221,7 @@ setup.setup_users() setup.setup_keyboard_map() setup.setup_locale() + setup.setup_plymouth_splash() setup.setup_timezone() system.pinch_system( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/version.py new/kiwi-9.11.8/kiwi/version.py --- old/kiwi-9.11.2/kiwi/version.py 2017-09-11 17:03:55.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/version.py 2017-09-29 15:04:59.000000000 +0200 @@ -18,5 +18,5 @@ """ Global version information used in kiwi and the package """ -__version__ = '9.11.2' -__githash__ = 'f83c3f74ac92a9a61ed16a95c92c34be5b789248' +__version__ = '9.11.8' +__githash__ = '8376e97fa86d45315def36842a1bfd0f572c5650' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/volume_manager/lvm.py new/kiwi-9.11.8/kiwi/volume_manager/lvm.py --- old/kiwi-9.11.2/kiwi/volume_manager/lvm.py 2017-08-10 08:39:05.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/volume_manager/lvm.py 2017-09-27 09:14:19.000000000 +0200 @@ -159,6 +159,19 @@ full_size_volume.name, full_size_volume.realpath ) + # re-order mount_list by mountpoint hierarchy + # This is needed because the handling of the fullsize volume and + # all other volumes is outside of the canonical order. If the + # fullsize volume forms a nested structure together with another + # volume the volume mount list must be re-ordered to avoid + # mounting the volumes in the wrong order + volume_paths = {} + for volume_mount in self.mount_list: + volume_paths[volume_mount.mountpoint] = volume_mount + self.mount_list = [] + for mount_path in Path.sort_by_hierarchy(sorted(volume_paths.keys())): + self.mount_list.append(volume_paths[mount_path]) + def get_fstab(self, persistency_type, filesystem_name): """ Implements creation of the fstab entries. The method diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi/xml_parse.py new/kiwi-9.11.8/kiwi/xml_parse.py --- old/kiwi-9.11.2/kiwi/xml_parse.py 2017-09-06 17:12:02.000000000 +0200 +++ new/kiwi-9.11.8/kiwi/xml_parse.py 2017-09-15 10:37:16.000000000 +0200 @@ -896,13 +896,13 @@ def set_noNamespaceSchemaLocation(self, noNamespaceSchemaLocation): self.noNamespaceSchemaLocation = noNamespaceSchemaLocation def get_schemaLocation(self): return self.schemaLocation def set_schemaLocation(self, schemaLocation): self.schemaLocation = schemaLocation - def validate_image_name(self, value): - # Validate type image-name, a restriction on xs:token. + def validate_safe_posix_name(self, value): + # Validate type safe-posix-name, a restriction on xs:token. if value is not None and Validate_simpletypes_: if not self.gds_validate_simple_patterns( - self.validate_image_name_patterns_, value): - warnings_.warn('Value "%s" does not match xsd pattern restrictions: %s' % (value.encode('utf-8'), self.validate_image_name_patterns_, )) - validate_image_name_patterns_ = [['^[a-zA-Z0-9_\\-\\.]+$']] + self.validate_safe_posix_name_patterns_, value): + warnings_.warn('Value "%s" does not match xsd pattern restrictions: %s' % (value.encode('utf-8'), self.validate_safe_posix_name_patterns_, )) + validate_safe_posix_name_patterns_ = [['^[a-zA-Z0-9_\\-\\.]+$']] def hasContent_(self): if ( self.description or @@ -994,7 +994,7 @@ already_processed.add('name') self.name = value self.name = ' '.join(self.name.split()) - self.validate_image_name(self.name) # validate type image-name + self.validate_safe_posix_name(self.name) # validate type safe-posix-name value = find_attr_value_('displayname', node) if value is not None and 'displayname' not in already_processed: already_processed.add('displayname') @@ -2847,6 +2847,13 @@ self.validate_vhd_tag_type_patterns_, value): warnings_.warn('Value "%s" does not match xsd pattern restrictions: %s' % (value.encode('utf-8'), self.validate_vhd_tag_type_patterns_, )) validate_vhd_tag_type_patterns_ = [['^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$']] + def validate_safe_posix_name(self, value): + # Validate type safe-posix-name, a restriction on xs:token. + if value is not None and Validate_simpletypes_: + if not self.gds_validate_simple_patterns( + self.validate_safe_posix_name_patterns_, value): + warnings_.warn('Value "%s" does not match xsd pattern restrictions: %s' % (value.encode('utf-8'), self.validate_safe_posix_name_patterns_, )) + validate_safe_posix_name_patterns_ = [['^[a-zA-Z0-9_\\-\\.]+$']] def hasContent_(self): if ( self.containerconfig or @@ -3034,7 +3041,7 @@ outfile.write(' vhdfixedtag=%s' % (quote_attrib(self.vhdfixedtag), )) if self.volid is not None and 'volid' not in already_processed: already_processed.add('volid') - outfile.write(' volid=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.volid), input_name='volid')), )) + outfile.write(' volid=%s' % (quote_attrib(self.volid), )) if self.wwid_wait_timeout is not None and 'wwid_wait_timeout' not in already_processed: already_processed.add('wwid_wait_timeout') outfile.write(' wwid_wait_timeout="%s"' % self.gds_format_integer(self.wwid_wait_timeout, input_name='wwid_wait_timeout')) @@ -3399,6 +3406,8 @@ if value is not None and 'volid' not in already_processed: already_processed.add('volid') self.volid = value + self.volid = ' '.join(self.volid.split()) + self.validate_safe_posix_name(self.volid) # validate type safe-posix-name value = find_attr_value_('wwid_wait_timeout', node) if value is not None and 'wwid_wait_timeout' not in already_processed: already_processed.add('wwid_wait_timeout') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi.egg-info/PKG-INFO new/kiwi-9.11.8/kiwi.egg-info/PKG-INFO --- old/kiwi-9.11.2/kiwi.egg-info/PKG-INFO 2017-09-11 17:15:37.000000000 +0200 +++ new/kiwi-9.11.8/kiwi.egg-info/PKG-INFO 2017-09-29 15:10:09.000000000 +0200 @@ -1,12 +1,13 @@ Metadata-Version: 1.1 Name: kiwi -Version: 9.11.2 +Version: 9.11.8 Summary: KIWI - Appliance Builder (next generation) Home-page: http://suse.github.io/kiwi Author: Marcus Schaefer Author-email: [email protected] License: UNKNOWN Download-URL: http://suse.github.io/kiwi +Description-Content-Type: UNKNOWN Description: UNKNOWN Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/kiwi.egg-info/SOURCES.txt new/kiwi-9.11.8/kiwi.egg-info/SOURCES.txt --- old/kiwi-9.11.2/kiwi.egg-info/SOURCES.txt 2017-09-11 17:15:37.000000000 +0200 +++ new/kiwi-9.11.8/kiwi.egg-info/SOURCES.txt 2017-09-29 15:10:10.000000000 +0200 @@ -362,6 +362,7 @@ kiwi/storage/subformat/vdi.py kiwi/storage/subformat/vhd.py kiwi/storage/subformat/vhdfixed.py +kiwi/storage/subformat/vhdx.py kiwi/storage/subformat/vmdk.py kiwi/storage/subformat/template/__init__.py kiwi/storage/subformat/template/vmware_settings.py @@ -578,6 +579,7 @@ test/unit/storage_subformat_vdi_test.py test/unit/storage_subformat_vhd_test.py test/unit/storage_subformat_vhdfixed_test.py +test/unit/storage_subformat_vhdx_test.py test/unit/storage_subformat_vmdk_test.py test/unit/system_identifier_test.py test/unit/system_kernel_test.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/package/python-kiwi-spec-template new/kiwi-9.11.8/package/python-kiwi-spec-template --- old/kiwi-9.11.2/package/python-kiwi-spec-template 2017-09-07 15:58:59.000000000 +0200 +++ new/kiwi-9.11.8/package/python-kiwi-spec-template 2017-09-29 14:30:13.000000000 +0200 @@ -311,12 +311,13 @@ %package -n dracut-kiwi-live Summary: KIWI - Dracut module for iso(live) image type BuildRequires: dracut +Requires: dialog Requires: xfsprogs Requires: e2fsprogs Requires: util-linux Requires: dracut %if 0%{?fedora} || 0%{?rhel} -Requires: cdrkit +Requires: genisoimage %else Requires: cdrkit-cdrtools-compat %endif @@ -340,6 +341,7 @@ for booting vmx images built with KIWI and configured to use an overlay root filesystem +%if 0%{?suse_version} %package -n kiwi-boot-requires Summary: KIWI - buildservice package requirements for boot images Provides: kiwi-boot:netboot @@ -365,13 +367,13 @@ License: GPL-3.0+ Group: System/Management - %description -n kiwi-boot-requires Meta package for the buildservice to pull in all required packages in order to have them in the buildservice created repositories to allow kiwi to build the boot image. This package must never be published nor installed by anybody else except for the buildservice, it is part of the kiwi - buildservice integration exclusively +%endif %package -n kiwi-man-pages Summary: KIWI - manual pages @@ -542,7 +544,7 @@ %ifarch %ix86 x86_64 %files -n kiwi-pxeboot %defattr(-, root, root) -%dir %attr(0750,tftp,tftp) /srv/tftpboot +%dir %attr(0755,tftp,tftp) /srv/tftpboot %dir /srv/tftpboot/KIWI %dir /srv/tftpboot/pxelinux.cfg %dir /srv/tftpboot/image @@ -550,7 +552,9 @@ %dir /srv/tftpboot/boot %endif +%if 0%{?suse_version} %files -n kiwi-boot-requires %defattr(-, root, root) +%endif %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/test/data/description/config.xml new/kiwi-9.11.8/test/data/description/config.xml --- old/kiwi-9.11.2/test/data/description/config.xml 2017-09-07 15:58:59.000000000 +0200 +++ new/kiwi-9.11.8/test/data/description/config.xml 2017-09-15 10:37:16.000000000 +0200 @@ -35,7 +35,7 @@ <locale>de_DE</locale> </preferences> <preferences> - <type bootloader="grub2" image="oem" primary="true" boot="oemboot/example-distribution" firmware="efi" kernelcmdline="splash" vga="0x303" editbootconfig="my_edit_boot_script" editbootinstall="/absolute/path/to/my_edit_boot_install" fsmountoptions="async" btrfs_root_is_snapshot="true" spare_part="200M" xen_server="true" formatoptions="force_size,super=man"> + <type bootloader="grub2" image="oem" primary="true" boot="oemboot/example-distribution" firmware="efi" kernelcmdline="splash" vga="0x303" editbootconfig="my_edit_boot_script" editbootinstall="/absolute/path/to/my_edit_boot_install" fsmountoptions="async" btrfs_root_is_snapshot="true" spare_part="200M" xen_server="true" formatoptions="force_size,super=man" filesystem="ext4"> <size unit="G" additive="true">1</size> <systemdisk name="mydisk"/> <machine memory="512" xen_loader="hvmloader"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/test/data/description.buildservice/appliance.kiwi new/kiwi-9.11.8/test/data/description.buildservice/appliance.kiwi --- old/kiwi-9.11.2/test/data/description.buildservice/appliance.kiwi 2017-09-07 15:58:59.000000000 +0200 +++ new/kiwi-9.11.8/test/data/description.buildservice/appliance.kiwi 2017-09-15 10:37:16.000000000 +0200 @@ -35,7 +35,7 @@ <locale>de_DE</locale> </preferences> <preferences> - <type bootloader="grub2" image="oem" primary="true" boot="oemboot/example-distribution" firmware="efi" kernelcmdline="splash" vga="0x303" editbootconfig="my_edit_boot_script" editbootinstall="/absolute/path/to/my_edit_boot_install" fsmountoptions="async" btrfs_root_is_snapshot="true" spare_part="200M" xen_server="true" formatoptions="force_size,super=man"> + <type bootloader="grub2" image="oem" primary="true" boot="oemboot/example-distribution" firmware="efi" kernelcmdline="splash" vga="0x303" editbootconfig="my_edit_boot_script" editbootinstall="/absolute/path/to/my_edit_boot_install" fsmountoptions="async" btrfs_root_is_snapshot="true" spare_part="200M" xen_server="true" formatoptions="force_size,super=man" filesystem="ext4"> <size unit="G" additive="true">1</size> <systemdisk name="mydisk"/> <machine memory="512" xen_loader="hvmloader"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/test/data/example_config.xml new/kiwi-9.11.8/test/data/example_config.xml --- old/kiwi-9.11.2/test/data/example_config.xml 2017-09-07 15:58:59.000000000 +0200 +++ new/kiwi-9.11.8/test/data/example_config.xml 2017-09-15 10:37:16.000000000 +0200 @@ -35,7 +35,7 @@ <locale>de_DE</locale> </preferences> <preferences> - <type bootloader="grub2" image="oem" primary="true" boot="oemboot/example-distribution" firmware="efi" kernelcmdline="splash" vga="0x303" editbootconfig="my_edit_boot_script" editbootinstall="/absolute/path/to/my_edit_boot_install" fsmountoptions="async" btrfs_root_is_snapshot="true" spare_part="200M" xen_server="true" formatoptions="force_size,super=man"> + <type bootloader="grub2" image="oem" primary="true" boot="oemboot/example-distribution" firmware="efi" kernelcmdline="splash" vga="0x303" editbootconfig="my_edit_boot_script" editbootinstall="/absolute/path/to/my_edit_boot_install" fsmountoptions="async" btrfs_root_is_snapshot="true" spare_part="200M" xen_server="true" formatoptions="force_size,super=man" filesystem="ext4"> <size unit="G" additive="true">1</size> <systemdisk name="mydisk"/> <machine memory="512" xen_loader="hvmloader"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/test/data/example_runtime_checker_config.xml new/kiwi-9.11.8/test/data/example_runtime_checker_config.xml --- old/kiwi-9.11.2/test/data/example_runtime_checker_config.xml 2017-09-07 15:58:59.000000000 +0200 +++ new/kiwi-9.11.8/test/data/example_runtime_checker_config.xml 2017-09-15 10:37:16.000000000 +0200 @@ -35,7 +35,7 @@ <locale>de_DE</locale> </preferences> <preferences> - <type bootloader="grub2" image="oem" primary="true" boot="oemboot/example-distribution" firmware="efi" kernelcmdline="splash" vga="0x303" editbootconfig="my_edit_boot_script" editbootinstall="my_edit_boot_install"> + <type bootloader="grub2" image="oem" primary="true" boot="oemboot/example-distribution" firmware="efi" kernelcmdline="splash" vga="0x303" editbootconfig="my_edit_boot_script" editbootinstall="my_edit_boot_install" filesystem="ext4"> <size unit="G" additive="true">1</size> <systemdisk name="mydisk"> <volume name="root" size="6G" mountpoint="/"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/test/data/root-dir/image/config.xml new/kiwi-9.11.8/test/data/root-dir/image/config.xml --- old/kiwi-9.11.2/test/data/root-dir/image/config.xml 2017-09-07 15:58:59.000000000 +0200 +++ new/kiwi-9.11.8/test/data/root-dir/image/config.xml 2017-09-15 10:37:16.000000000 +0200 @@ -35,7 +35,7 @@ <locale>de_DE</locale> </preferences> <preferences> - <type bootloader="grub2" image="oem" primary="true" boot="oemboot/example-distribution" firmware="efi" kernelcmdline="splash" vga="0x303" editbootconfig="my_edit_boot_script" editbootinstall="/absolute/path/to/my_edit_boot_install" fsmountoptions="async" btrfs_root_is_snapshot="true" spare_part="200M" xen_server="true" formatoptions="force_size,super=man"> + <type bootloader="grub2" image="oem" primary="true" boot="oemboot/example-distribution" firmware="efi" kernelcmdline="splash" vga="0x303" editbootconfig="my_edit_boot_script" editbootinstall="/absolute/path/to/my_edit_boot_install" fsmountoptions="async" btrfs_root_is_snapshot="true" spare_part="200M" xen_server="true" formatoptions="force_size,super=man" filesystem="ext4"> <size unit="G" additive="true">1</size> <systemdisk name="mydisk"/> <machine memory="512" xen_loader="hvmloader"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/test/unit/builder_pxe_test.py new/kiwi-9.11.8/test/unit/builder_pxe_test.py --- old/kiwi-9.11.2/test/unit/builder_pxe_test.py 2017-08-03 11:00:43.000000000 +0200 +++ new/kiwi-9.11.8/test/unit/builder_pxe_test.py 2017-09-27 14:50:37.000000000 +0200 @@ -22,6 +22,7 @@ ) self.boot_image_task = mock.MagicMock() self.boot_image_task.boot_root_directory = 'initrd_dir' + self.boot_image_task.initrd_filename = 'initrd_file_name' mock_boot.return_value = self.boot_image_task self.filesystem = mock.MagicMock() self.filesystem.filename = 'myimage.fs' @@ -90,6 +91,18 @@ self.setup.export_package_verification.assert_called_once_with( 'target_dir' ) + mock_command.assert_called_once_with( + [ + 'bash', '-c', + 'tar -C target_dir -c --to-stdout ' + + 'myimage-42.kernel ' + + 'initrd_file_name ' + + 'compressed-file-name ' + + 'compressed-file-name.md5 ' + + '| xz -f --threads=0 > ' + + 'target_dir/some-image.x86_64-1.2.3.tar.xz' + ] + ) # warning for not implemented pxedeploy handling assert mock_log_warn.called diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/test/unit/iso_test.py new/kiwi-9.11.8/test/unit/iso_test.py --- old/kiwi-9.11.2/test/unit/iso_test.py 2017-09-06 16:51:04.000000000 +0200 +++ new/kiwi-9.11.8/test/unit/iso_test.py 2017-09-28 15:41:15.000000000 +0200 @@ -264,6 +264,38 @@ mock_command.return_value = command Iso.create_hybrid(42, mbrid, 'some-iso', 'efi') + @raises(KiwiCommandError) + @patch('kiwi.iso.Command.run') + def test_create_hybrid_with_multiple_errors(self, mock_command): + mbrid = mock.Mock() + mbrid.get_id = mock.Mock( + return_value='0x0815' + ) + command = mock.Mock() + command.error = \ + 'isohybrid: Warning: more than 1024 cylinders: 1817\n' + \ + 'isohybrid: Not all BIOSes will be able to boot this device\n' + mock_command.return_value = command + Iso.create_hybrid(42, mbrid, 'some-iso', 'efi') + + @patch('kiwi.iso.Command.run') + def test_create_hybrid_with_cylinders_warning(self, mock_command): + mbrid = mock.Mock() + mbrid.get_id = mock.Mock( + return_value='0x0815' + ) + command = mock.Mock() + command.error = 'isohybrid: Warning: more than 1024 cylinders: 1817' + mock_command.return_value = command + Iso.create_hybrid(42, mbrid, 'some-iso', 'efi') + mock_command.assert_called_once_with( + [ + 'isohybrid', '--offset', '42', + '--id', '0x0815', '--type', '0x83', + '--uefi', 'some-iso' + ] + ) + @patch('kiwi.iso.Command.run') def test_set_media_tag(self, mock_command): Iso.set_media_tag('foo') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/test/unit/storage_subformat_test.py new/kiwi-9.11.8/test/unit/storage_subformat_test.py --- old/kiwi-9.11.2/test/unit/storage_subformat_test.py 2017-08-21 09:31:41.000000000 +0200 +++ new/kiwi-9.11.8/test/unit/storage_subformat_test.py 2017-09-15 10:37:16.000000000 +0200 @@ -48,6 +48,13 @@ self.xml_state, 'root_dir', 'target_dir', {} ) + @patch('kiwi.storage.subformat.DiskFormatVhdx') + def test_disk_format_vhdx(self, mock_vhdx): + DiskFormat('vhdx', self.xml_state, 'root_dir', 'target_dir') + mock_vhdx.assert_called_once_with( + self.xml_state, 'root_dir', 'target_dir', {} + ) + @patch('kiwi.storage.subformat.DiskFormatVhdFixed') def test_disk_format_vhdfixed(self, mock_vhdfixed): self.xml_state.build_type.get_vhdfixedtag = mock.Mock( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/test/unit/storage_subformat_vhdx_test.py new/kiwi-9.11.8/test/unit/storage_subformat_vhdx_test.py --- old/kiwi-9.11.2/test/unit/storage_subformat_vhdx_test.py 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi-9.11.8/test/unit/storage_subformat_vhdx_test.py 2017-09-15 10:37:16.000000000 +0200 @@ -0,0 +1,41 @@ +from mock import patch + +import mock + +from kiwi.storage.subformat.vhdx import DiskFormatVhdx + + +class TestDiskFormatVhdx(object): + @patch('platform.machine') + def setup(self, mock_machine): + mock_machine.return_value = 'x86_64' + xml_data = mock.Mock() + xml_data.get_name = mock.Mock( + return_value='some-disk-image' + ) + self.xml_state = mock.Mock() + self.xml_state.xml_data = xml_data + self.xml_state.get_image_version = mock.Mock( + return_value='1.2.3' + ) + self.disk_format = DiskFormatVhdx( + self.xml_state, 'root_dir', 'target_dir' + ) + + def test_post_init(self): + self.disk_format.post_init({'option': 'value'}) + assert self.disk_format.options == [ + '-o', 'option=value', '-o', 'subformat=dynamic' + ] + + @patch('kiwi.storage.subformat.vhdx.Command.run') + def test_create_image_format(self, mock_command): + self.disk_format.create_image_format() + mock_command.assert_called_once_with( + [ + 'qemu-img', 'convert', '-f', 'raw', + 'target_dir/some-disk-image.x86_64-1.2.3.raw', '-O', 'vhdx', + '-o', 'subformat=dynamic', + 'target_dir/some-disk-image.x86_64-1.2.3.vhdx' + ] + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/test/unit/system_setup_test.py new/kiwi-9.11.8/test/unit/system_setup_test.py --- old/kiwi-9.11.2/test/unit/system_setup_test.py 2017-08-03 11:00:43.000000000 +0200 +++ new/kiwi-9.11.8/test/unit/system_setup_test.py 2017-09-19 11:16:53.000000000 +0200 @@ -676,7 +676,7 @@ assert result == 'target_dir/some-image.x86_64-1.2.3.packages' mock_command.assert_called_once_with([ 'rpm', '--root', 'root_dir', '-qa', '--qf', - '%{NAME}|%{EPOCH}|%{VERSION}|%{RELEASE}|%{ARCH}|%{DISTURL}|\\n' + '%{NAME}|%{EPOCH}|%{VERSION}|%{RELEASE}|%{ARCH}|%{DISTURL}\\n' ]) mock_open.assert_called_once_with( 'target_dir/some-image.x86_64-1.2.3.packages', 'w' @@ -697,7 +697,7 @@ assert result == 'target_dir/some-image.x86_64-1.2.3.packages' mock_command.assert_called_once_with([ 'dpkg-query', '--admindir', 'root_dir/var/lib/dpkg', '-W', - '-f', '${Package}|${Version}|${Architecture}\n' + '-f', '${Package}|None|${Version}|None|${Architecture}|None\\n' ]) mock_open.assert_called_once_with( 'target_dir/some-image.x86_64-1.2.3.packages', 'w' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi-9.11.2/test/unit/tasks_system_build_test.py new/kiwi-9.11.8/test/unit/tasks_system_build_test.py --- old/kiwi-9.11.2/test/unit/tasks_system_build_test.py 2017-09-07 15:58:59.000000000 +0200 +++ new/kiwi-9.11.8/test/unit/tasks_system_build_test.py 2017-09-21 13:52:36.000000000 +0200 @@ -123,6 +123,7 @@ self.setup.setup_users.assert_called_once_with() self.setup.setup_keyboard_map.assert_called_once_with() self.setup.setup_locale.assert_called_once_with() + self.setup.setup_plymouth_splash.assert_called_once_with() self.setup.setup_timezone.assert_called_once_with() self.system_prepare.pinch_system.assert_called_once_with( manager=self.manager, force=True
