Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2017-02-08 10:44:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-12-11 13:26:23.751576202 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2017-02-08 10:44:02.785188661 +0100 @@ -1,0 +2,98 @@ +Thu Jan 26 11:54:01 CET 2017 - m...@suse.de + +- v7.04.26 released + +------------------------------------------------------------------- +Thu Jan 26 11:37:46 CET 2017 - m...@suse.de + +- Fixup setupMachineID + + Cleaning up existing machine id files by deleting them + causes an interactive session to be started by systemd + This is something we don't want. As the consequences + of touching the machine id files seems to be too critical + the method has been turned into a hook caller. This + allows the user to make use of it on their own purpose + and by default doesn't mess with the machine id files + This Fixes #628 + +------------------------------------------------------------------- +Thu Jan 26 11:10:54 CET 2017 - m...@suse.de + +- v7.04.25 released + +------------------------------------------------------------------- +Wed Jan 25 10:17:46 CET 2017 - dcass...@suse.com + +- Validate package memtest86+ is present for Memory Test + + This commits adds a validation to verify memtest86+ package is + included in the kiwi description file before including the + 'Memory Test' entry in the grub configuration. It applies + for ISO images. + + This fixes bnc#1014150 + +------------------------------------------------------------------- +Tue Jan 24 09:49:59 CET 2017 - m...@suse.de + +- v7.04.24 released + +------------------------------------------------------------------- +Tue Jan 24 09:49:33 CET 2017 - m...@suse.de + +- Change processing of setupMachineID + + Instead of creating new machine ids for systemd and dbus + the method now cleans up all existing machine ids and + leave it up to systemd to initialize and create new ids. + This allows to make use of the native way how systemd + retrieves and handles machine ids + +------------------------------------------------------------------- +Thu Jan 19 10:26:43 CET 2017 - m...@suse.de + +- v7.04.23 released + +------------------------------------------------------------------- +Thu Jan 19 09:55:14 CET 2017 - m...@suse.de + +- Initialize the systemd machine ID on first boot + + The systemd machine id is considered to be a unique information + Thus it is required to initialize it on first boot of the image. + If the image uses the kiwi boot code (initrd) this action is + performed and and Fixes #624 + +------------------------------------------------------------------- +Tue Jan 17 16:12:15 CET 2017 - m...@suse.de + +- v7.04.22 released + +------------------------------------------------------------------- +Tue Jan 17 16:08:37 CET 2017 - m...@suse.de + +- Allow unix device names in oem-unattended-id setup + +------------------------------------------------------------------- +Tue Jan 17 16:04:07 CET 2017 - m...@suse.de + +- Don't delete ip tools from oemboot + + network tools are needed for oem disk deployment via pxe + +------------------------------------------------------------------- +Sat Dec 24 13:00:13 CET 2016 - susza...@gmail.com + +- Translated using Weblate (Polish) + + Currently translated at 100.0% (28 of 28 strings) + +------------------------------------------------------------------- +Mon Dec 19 16:10:33 CET 2016 - pmantz...@hotmail.com + +- Translated using Weblate (Greek) + + Currently translated at 89.2% (25 of 28 strings) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.0AGibi/_old 2017-02-08 10:44:03.901033183 +0100 +++ /var/tmp/diff_new_pack.0AGibi/_new 2017-02-08 10:44:03.901033183 +0100 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.04.21 +Version: 7.04.26 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 2016-04-18 16:58:06.610211984 +0200 +++ new/kiwi/.revision 2016-04-18 16:58:06.610211984 +0200 @@ -1 +1 @@ -0845f334f23450ad03841febae8ddd10cb3b4a0b +b831b559f37240110eb20024aea61da485ec0f43 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/el/LC_MESSAGES/kiwi.po new/kiwi/locale/el/LC_MESSAGES/kiwi.po --- old/kiwi/locale/el/LC_MESSAGES/kiwi.po 2016-04-18 16:58:06.610211984 +0200 +++ new/kiwi/locale/el/LC_MESSAGES/kiwi.po 2016-12-20 09:02:04.282792278 +0100 @@ -8,15 +8,15 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-07-27 16:23+0200\n" -"PO-Revision-Date: 2016-04-11 08:35+0000\n" -"Last-Translator: alexandros Vennos <alexandros.v...@gmail.com>\n" -"Language-Team: Greek <http://l10n.opensuse.org/projects/kiwi/master/el/>\n" +"PO-Revision-Date: 2016-12-19 16:10+0000\n" +"Last-Translator: Panagiotis Mantzios <pmantz...@hotmail.com>\n" +"Language-Team: Greek <https://l10n.opensuse.org/projects/kiwi/master/el/>\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bits\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5\n" +"X-Generator: Weblate 2.6\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -81,10 +81,14 @@ msgid "Bootloader installation has failed" msgstr "Η εγκατάσταση του Bootloader απέτυχε" +#, fuzzy 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 "" +"Το σύστημα δεν θα είναι σε θέση να κάνει επανεκκίνηση. Παρακαλώ διορθώστε το " +"και εγκαταστήστε τον bootloader πριν την επόμενη επανεκκίνηση. Ελέγξτε το " +"/var/log/boot.kiwi για περισσότερες πληροφορίες." msgid "Please remove the CD/DVD before reboot" msgstr "Παρακαλώ αφαιρέστε το CD/DVD πριν την επανεκκίνηση" @@ -109,8 +113,12 @@ msgid "Select %1 partition for installation:" msgstr "Επιλέξτε %1 κατάτμηση για εγκατάσταση:" +#, fuzzy msgid "System will be shutdown. Remove USB stick before power on" msgstr "" +"Το σύστημα θα τερματιστεί. Αφαιρέστε το USB πριν από την έναρξη του " +"συστήματος." +#, fuzzy msgid "Please remove the CD/DVD before shutdown" -msgstr "" +msgstr "Παρακαλώ αφαιρέστε το CD/DVD πριν από τον τερματισμό του συστήματος" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/pl/LC_MESSAGES/kiwi.po new/kiwi/locale/pl/LC_MESSAGES/kiwi.po --- old/kiwi/locale/pl/LC_MESSAGES/kiwi.po 2016-04-18 16:58:06.610211984 +0200 +++ new/kiwi/locale/pl/LC_MESSAGES/kiwi.po 2017-01-17 16:00:11.409800562 +0100 @@ -10,16 +10,16 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-07-27 16:23+0200\n" -"PO-Revision-Date: 2015-10-12 11:31+0200\n" -"Last-Translator: Frantisek Komarek <frantisek.koma...@gmail.com>\n" -"Language-Team: Polish <http://10n.opensuse.org/projects/kiwi/master/pl/>\n" +"PO-Revision-Date: 2016-12-24 13:00+0000\n" +"Last-Translator: Kamil Stańczyk <susza...@gmail.com>\n" +"Language-Team: Polish <https://l10n.opensuse.org/projects/kiwi/master/pl/>\n" "Language: pl\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==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.3\n" +"X-Generator: Weblate 2.6\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -27,7 +27,7 @@ #. boot code for KIWI #. msgid "Boot continues in 10 sec" -msgstr "" +msgstr "Rozruch zostanie kontynuowany za 10 sekund" msgid "Enter LUKS passphrase" msgstr "Proszę podać hasło LUKS" @@ -82,12 +82,15 @@ msgstr "Wyjście" msgid "Bootloader installation has failed" -msgstr "" +msgstr "Instalacja programu rozruchowego nie powiodła się" 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 "" +"System nie będzie wstanie się uruchomić. Proszę zainstalować program " +"rozruchowy przed następnym rozruchem. Sprawdź /var/log/boot.kiwi by uzyskać " +"szczegóły" msgid "Please remove the CD/DVD before reboot" msgstr "Proszę wyjąć płytę CD/DVD przed ponownym uruchomieniem" @@ -111,8 +114,7 @@ msgstr "Proszę wybrać partycję %1 do instalacji:" msgid "System will be shutdown. Remove USB stick before power on" -msgstr "" +msgstr "System zostanie zamknięty. Usuń pamięć USB przed rozruchem" -#, fuzzy msgid "Please remove the CD/DVD before shutdown" -msgstr "Proszę wyjąć płytę instalacyjnę przed kontynuowaniem" +msgstr "Proszę wyjąć płytę instalacyjną przed zamknięciem" 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 2016-12-02 10:35:51.389090659 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2017-01-26 11:53:53.714400169 +0100 @@ -2018,7 +2018,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.04.21"; + $data{Version} = "7.04.26"; $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/KIWIImage.pm new/kiwi/modules/KIWIImage.pm --- old/kiwi/modules/KIWIImage.pm 2016-11-03 10:12:59.555666517 +0100 +++ new/kiwi/modules/KIWIImage.pm 2017-01-26 11:03:33.394179394 +0100 @@ -1138,6 +1138,22 @@ $rootTarget = $cmdL->getConfigDir(); } my $checkBase = $rootTarget."/".$baseSystem; + + #========================================== + # Check Memory Test dependecies + #------------------------------------------ + my $checkMemtest = 0; + my $pckgs = $xml -> getPackages(); + push @{$pckgs}, @{$xml -> getBootstrapPackages()}; + for my $pckg (@{$pckgs}) { + my $pname = $pckg -> getName(); + my $version; + ($pname, $version) = split(/=/,$pname); + if ($pname =~ 'memtest86.*'){ + $checkMemtest = 1; + } + } + #========================================== # Failsafe boot options #------------------------------------------ @@ -2137,9 +2153,11 @@ print $IFD "label harddisk\n"; print $IFD " localboot 0x80"."\n"; print $IFD "\n"; - print $IFD "label memtest"."\n"; - print $IFD " kernel memtest"."\n"; - print $IFD "\n"; + if ($checkMemtest) { + print $IFD "label memtest"."\n"; + print $IFD " kernel memtest"."\n"; + print $IFD "\n"; + } $IFD -> close(); #========================================== # setup isolinux.msg file @@ -2163,7 +2181,9 @@ printf ($MFD "%-20s - %s\n",$lsafe,"Live System failsafe mode"); printf ($MFD "%-20s - %s\n","harddisk","Local boot from hard disk"); printf ($MFD "%-20s - %s\n","mediacheck","Media check"); - printf ($MFD "%-20s - %s\n","memtest","Memory Test"); + if ($checkMemtest) { + printf ($MFD "%-20s - %s\n","memtest","Memory Test"); + } print $MFD "\n"; print $MFD "Have a lot of fun..."."\n"; $MFD -> close(); 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 2016-11-18 16:21:35.757693894 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2017-01-26 11:53:38.026356618 +0100 @@ -8101,6 +8101,17 @@ rm -rf /config } #====================================== +# setupMachineID +#-------------------------------------- +function setupMachineID { + # /.../ + # This method can be used to handle the machine ID + # in /etc/machine-id and/or /var/lib/dbus/machine-id + # It is actually implemented as a custom hook script + # ---- + runHook handleMachineID "$@" +} +#====================================== # activateImage #-------------------------------------- function activateImage { @@ -8161,12 +8172,6 @@ fi fi #====================================== - # create dbus machine id - #-------------------------------------- - if lookup dbus-uuidgen &>/dev/null;then - dbus-uuidgen > $prefix/var/lib/dbus/machine-id - fi - #====================================== # move device nodes #-------------------------------------- Echo "Activating Image: [$name]" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-dump new/kiwi/system/boot/armv7l/oemboot/suse-dump --- old/kiwi/system/boot/armv7l/oemboot/suse-dump 2016-07-26 13:39:56.396859250 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-dump 2017-01-17 16:11:28.335717440 +0100 @@ -946,6 +946,13 @@ fi fi if [ $found -eq 0 ];then + ux_device=/dev/$kiwi_oemunattended_id + if [ -e $ux_device ];then + found=1 + break + fi + fi + if [ $found -eq 0 ];then systemException \ "Storage ID: $kiwi_oemunattended_id not found" \ "reboot" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-preinit new/kiwi/system/boot/armv7l/oemboot/suse-preinit --- old/kiwi/system/boot/armv7l/oemboot/suse-preinit 2016-07-26 13:39:56.408859313 +0200 +++ new/kiwi/system/boot/armv7l/oemboot/suse-preinit 2017-01-19 10:26:02.725516714 +0100 @@ -141,12 +141,17 @@ setupConsole #====================================== -# 10) Run user script +# 10) setup machine id +#-------------------------------------- +setupMachineID + +#====================================== +# 11) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 11) kill udev +# 12) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/vmxboot/suse-preinit new/kiwi/system/boot/armv7l/vmxboot/suse-preinit --- old/kiwi/system/boot/armv7l/vmxboot/suse-preinit 2016-07-26 13:39:56.408859313 +0200 +++ new/kiwi/system/boot/armv7l/vmxboot/suse-preinit 2017-01-19 10:26:02.725516714 +0100 @@ -76,12 +76,17 @@ setupConsole #====================================== -# 9) Run user script +# 9) setup machine id +#-------------------------------------- +setupMachineID + +#====================================== +# 10) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 10) kill udev +# 11) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-preinit new/kiwi/system/boot/ix86/isoboot/suse-preinit --- old/kiwi/system/boot/ix86/isoboot/suse-preinit 2016-07-26 13:39:56.408859313 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-preinit 2017-01-19 10:26:02.725516714 +0100 @@ -36,11 +36,16 @@ setupConsole #====================================== -# 4) create framebuffer devices +# 4) setup machine id +#-------------------------------------- +setupMachineID + +#====================================== +# 5) create framebuffer devices #-------------------------------------- createFramebufferDevices #====================================== -# 5) clean mount +# 6) clean mount #-------------------------------------- umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-preinit new/kiwi/system/boot/ix86/netboot/suse-preinit --- old/kiwi/system/boot/ix86/netboot/suse-preinit 2016-07-26 13:39:56.412859325 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-preinit 2017-01-19 10:26:02.725516714 +0100 @@ -117,6 +117,7 @@ #-------------------------------------- if [ "$systemIntegrity" = "clean" ];then setupConsole + setupMachineID fi #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-07.0/config.xml new/kiwi/system/boot/ix86/oemboot/rhel-07.0/config.xml --- old/kiwi/system/boot/ix86/oemboot/rhel-07.0/config.xml 2016-04-18 16:58:06.638212050 +0200 +++ new/kiwi/system/boot/ix86/oemboot/rhel-07.0/config.xml 2017-01-17 16:03:51.934425202 +0100 @@ -129,12 +129,10 @@ <package name="diffutils"/> <package name="expat"/> <package name="freetype"/> - <package name="gawk"/> <package name="gdbm"/> <package name="glib2"/> <package name="hdparm"/> <package name="info"/> - <package name="iproute"/> <package name="irqbalance"/> <package name="logrotate"/> <package name="make"/> @@ -142,7 +140,6 @@ <package name="mingetty"/> <package name="mktemp"/> <package name="mtools"/> - <package name="net-tools"/> <package name="openldap-clients"/> <package name="perl"/> <package name="perl-HTML-Parser"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-dump new/kiwi/system/boot/ix86/oemboot/rhel-dump --- old/kiwi/system/boot/ix86/oemboot/rhel-dump 2016-07-26 13:39:56.412859325 +0200 +++ new/kiwi/system/boot/ix86/oemboot/rhel-dump 2017-01-17 16:11:28.335717440 +0100 @@ -946,6 +946,13 @@ fi fi if [ $found -eq 0 ];then + ux_device=/dev/$kiwi_oemunattended_id + if [ -e $ux_device ];then + found=1 + break + fi + fi + if [ $found -eq 0 ];then systemException \ "Storage ID: $kiwi_oemunattended_id not found" \ "reboot" @@ -1037,7 +1044,7 @@ #====================================== # activate raid disks #-------------------------------------- - dmraid -a y + dmraid -a y -p #====================================== # wait for devices to settle #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-dump new/kiwi/system/boot/ix86/oemboot/suse-dump --- old/kiwi/system/boot/ix86/oemboot/suse-dump 2016-07-26 13:39:56.412859325 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2017-01-17 16:08:19.295182281 +0100 @@ -946,6 +946,13 @@ fi fi if [ $found -eq 0 ];then + ux_device=/dev/$kiwi_oemunattended_id + if [ -e $ux_device ];then + found=1 + break + fi + fi + if [ $found -eq 0 ];then systemException \ "Storage ID: $kiwi_oemunattended_id not found" \ "reboot" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-preinit new/kiwi/system/boot/ix86/oemboot/suse-preinit --- old/kiwi/system/boot/ix86/oemboot/suse-preinit 2016-07-26 13:39:56.412859325 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-preinit 2017-01-19 10:26:02.725516714 +0100 @@ -141,12 +141,17 @@ setupConsole #====================================== -# 10) Run user script +# 10) setup machine id +#-------------------------------------- +setupMachineID + +#====================================== +# 11) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 11) kill udev +# 12) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-preinit new/kiwi/system/boot/ix86/vmxboot/suse-preinit --- old/kiwi/system/boot/ix86/vmxboot/suse-preinit 2016-07-26 13:39:56.412859325 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-preinit 2017-01-19 10:26:02.725516714 +0100 @@ -76,12 +76,17 @@ setupConsole #====================================== -# 9) Run user script +# 9) setup machine id +#-------------------------------------- +setupMachineID + +#====================================== +# 10) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 10) kill udev +# 11) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-preinit new/kiwi/system/boot/ppc/netboot/suse-preinit --- old/kiwi/system/boot/ppc/netboot/suse-preinit 2016-07-26 13:39:56.412859325 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-preinit 2017-01-19 10:26:02.725516714 +0100 @@ -117,6 +117,7 @@ #-------------------------------------- if [ "$systemIntegrity" = "clean" ];then setupConsole + setupMachineID fi #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-dump new/kiwi/system/boot/ppc/oemboot/suse-dump --- old/kiwi/system/boot/ppc/oemboot/suse-dump 2016-07-26 13:39:56.412859325 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-dump 2017-01-17 16:11:28.339717451 +0100 @@ -946,6 +946,13 @@ fi fi if [ $found -eq 0 ];then + ux_device=/dev/$kiwi_oemunattended_id + if [ -e $ux_device ];then + found=1 + break + fi + fi + if [ $found -eq 0 ];then systemException \ "Storage ID: $kiwi_oemunattended_id not found" \ "reboot" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-preinit new/kiwi/system/boot/ppc/oemboot/suse-preinit --- old/kiwi/system/boot/ppc/oemboot/suse-preinit 2016-07-26 13:39:56.412859325 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-preinit 2017-01-19 10:26:02.725516714 +0100 @@ -141,12 +141,17 @@ setupConsole #====================================== -# 10) Run user script +# 10) setup machine id +#-------------------------------------- +setupMachineID + +#====================================== +# 11) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 11) kill udev +# 12) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-preinit new/kiwi/system/boot/ppc/vmxboot/suse-preinit --- old/kiwi/system/boot/ppc/vmxboot/suse-preinit 2016-07-26 13:39:56.412859325 +0200 +++ new/kiwi/system/boot/ppc/vmxboot/suse-preinit 2017-01-19 10:26:02.725516714 +0100 @@ -76,12 +76,17 @@ setupConsole #====================================== -# 9) Run user script +# 9) setup machine id +#-------------------------------------- +setupMachineID + +#====================================== +# 10) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 10) kill udev +# 11) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-preinit new/kiwi/system/boot/s390/netboot/suse-preinit --- old/kiwi/system/boot/s390/netboot/suse-preinit 2016-07-26 13:39:56.412859325 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-preinit 2017-01-19 10:26:02.725516714 +0100 @@ -123,6 +123,7 @@ #-------------------------------------- if [ "$systemIntegrity" = "clean" ];then setupConsole + setupMachineID fi #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-dump new/kiwi/system/boot/s390/oemboot/suse-dump --- old/kiwi/system/boot/s390/oemboot/suse-dump 2016-07-26 13:39:56.416859342 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-dump 2017-01-17 16:11:28.339717451 +0100 @@ -946,6 +946,13 @@ fi fi if [ $found -eq 0 ];then + ux_device=/dev/$kiwi_oemunattended_id + if [ -e $ux_device ];then + found=1 + break + fi + fi + if [ $found -eq 0 ];then systemException \ "Storage ID: $kiwi_oemunattended_id not found" \ "reboot" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-preinit new/kiwi/system/boot/s390/oemboot/suse-preinit --- old/kiwi/system/boot/s390/oemboot/suse-preinit 2016-07-26 13:39:56.416859342 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-preinit 2017-01-19 10:26:02.725516714 +0100 @@ -154,11 +154,16 @@ setupConsole #====================================== -# 11) load network module +# 11) setup machine id +#-------------------------------------- +setupMachineID + +#====================================== +# 12) load network module #-------------------------------------- if loadNetworkCardS390 "0.0.0191";then #====================================== - # 11.2) Setup network interface and DNS + # 12.2) Setup network interface and DNS #-------------------------------------- setupNetworkInterfaceS390 udevPending @@ -167,12 +172,12 @@ fi #====================================== -# 12) Run user script +# 13) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 13) kill udev +# 14) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-preinit new/kiwi/system/boot/s390/vmxboot/suse-preinit --- old/kiwi/system/boot/s390/vmxboot/suse-preinit 2016-07-26 13:39:56.416859342 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-preinit 2017-01-19 10:26:02.725516714 +0100 @@ -89,11 +89,16 @@ setupConsole #====================================== -# 10) load network module +# 10) setup machine id +#-------------------------------------- +setupMachineID + +#====================================== +# 11) load network module #-------------------------------------- if loadNetworkCardS390 "0.0.0191";then #====================================== - # 10.2) Setup network interface and DNS + # 11.2) Setup network interface and DNS #-------------------------------------- setupNetworkInterfaceS390 udevPending @@ -102,12 +107,12 @@ fi #====================================== -# 11) Run user script +# 12) Run user script #-------------------------------------- runHook preCallInit #====================================== -# 12) kill udev +# 13) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems
