Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2017-03-10 20:34:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi" Fri Mar 10 20:34:15 2017 rev:654 rq:460819 version:7.04.28 Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2017-02-20 14:26:54.649261465 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2017-03-10 20:34:17.170788705 +0100 @@ -1,0 +2,42 @@ +Tue Feb 21 09:24:11 CET 2017 - m...@suse.de + +- v7.04.28 released + +------------------------------------------------------------------- +Tue Feb 21 09:23:19 CET 2017 - m...@suse.de + +- Wait for network drivers to pass init + + Each network interface will be switched off for a short + moment when the kernel network driver is loaded. During + that time the link status information would be misleading. + Thus we wait a short time before the link status check + is started + +------------------------------------------------------------------- +Mon Feb 20 09:31:48 CET 2017 - shshyukr...@suse.com + +- Translated using Weblate (Bulgarian) + + Currently translated at 100.0% (28 of 28 strings) + +------------------------------------------------------------------- +Thu Feb 16 15:40:39 CET 2017 - m...@suse.de + +- Fixed waitForLinkUp and setIPLinkUp + + The setIPLinkUp method did not handle the return value of the + waitForLinkUp call and always returned success even if + waitForLinkUp ran into a timeout + + The waitForLinkUp method was improved in a way that it does + not wait if the link detection discovered the interface is + unplugged. The detection if a cable is connected or not only + works if the ifplugstatus tool was found in the initrd + +------------------------------------------------------------------- +Thu Feb 9 15:11:10 CET 2017 - f...@suse.de + +- Fixed typo (bsc #984158) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.770Rwu/_old 2017-03-10 20:34:18.402614140 +0100 +++ /var/tmp/diff_new_pack.770Rwu/_new 2017-03-10 20:34:18.406613573 +0100 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.04.27 +Version: 7.04.28 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc ++++++ kiwi-docu.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/docbook/xml/kiwi-doc-introduction.xml new/doc/docbook/xml/kiwi-doc-introduction.xml --- old/doc/docbook/xml/kiwi-doc-introduction.xml 2016-04-18 16:58:06.474211792 +0200 +++ new/doc/docbook/xml/kiwi-doc-introduction.xml 2017-02-09 16:36:31.423011698 +0100 @@ -86,7 +86,7 @@ </listitem> <listitem> <para> - Vagrant (<filename class="extension">.vagrant</filename> + Vagrant (<filename class="extension">.vagrant</filename>) </para> </listitem> <listitem> @@ -145,9 +145,9 @@ </para> </formalpara> </step> - </procedure> + </procedure> </sect1> - + <sect1 id="sec.introduction.howtousekiwi"> <title>How to use KIWI?</title> ++++++ 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 @@ -d68dc14a0d9cd38a27d8f3cdd4a34011785fd261 +092c30e4dfb6c97dedfc112d59a9d275a1f7af6c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/locale/bg/LC_MESSAGES/kiwi.po new/kiwi/locale/bg/LC_MESSAGES/kiwi.po --- old/kiwi/locale/bg/LC_MESSAGES/kiwi.po 2016-04-18 16:58:06.610211984 +0200 +++ new/kiwi/locale/bg/LC_MESSAGES/kiwi.po 2017-02-21 09:21:46.721003586 +0100 @@ -5,15 +5,16 @@ "Project-Id-Version: kiwi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-07-27 16:23+0200\n" -"PO-Revision-Date: 2011-10-11 15:59+0300\n" -"Last-Translator: Borislav Mitev <morbid_vi...@tkzs.org>\n" -"Language-Team: Bulgarian <kde-i18n-...@kde.org>\n" +"PO-Revision-Date: 2017-02-20 09:32+0000\n" +"Last-Translator: Shyukri Shyukriev <shshyukr...@suse.com>\n" +"Language-Team: Bulgarian <https://l10n.opensuse.org/projects/kiwi/master/bg/>" +"\n" "Language: bg\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.2\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.6\n" #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -21,7 +22,7 @@ #. boot code for KIWI #. msgid "Boot continues in 10 sec" -msgstr "" +msgstr "Стартирането продължава 10 секунди" msgid "Enter LUKS passphrase" msgstr "Въведете LUKS паролна фраза" @@ -77,12 +78,14 @@ msgstr "Изход" msgid "Bootloader installation has failed" -msgstr "" +msgstr "Bootloader инсталацията е неуспешна" 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-то преди да рестартирате" @@ -108,8 +111,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/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2017-02-08 10:56:56.554556321 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2017-02-21 09:24:07.285402526 +0100 @@ -2018,7 +2018,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.04.27"; + $data{Version} = "7.04.28"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2017-02-08 10:54:34.882157952 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2017-02-21 09:23:06.137230803 +0100 @@ -7421,24 +7421,49 @@ local IFS=$IFS_ORIG local dev=$1 local check=0 - if [ -x /usr/sbin/ifplugstatus ]; then + local linkstatus + local linkgrep + local link_unplugged + local sleep_timeout=2 + local retry_count=30 + #====================================== + # Wait for network drivers to pass init + #-------------------------------------- + # each network interface will be switched off for a short + # moment when the kernel network driver is loaded. During + # that time the link status information would be misleading. + # Thus we wait a short time before the link status check + # is started + sleep 1 + #====================================== + # Lookup link status... + #-------------------------------------- + if lookup ifplugstatus &>/dev/null;then linkstatus=ifplugstatus linkgrep="link beat detected" + link_unplugged="unplugged" else - linkstatus="ip link ls" + linkstatus="ip link ls" linkgrep="state UP" fi while true;do - $linkstatus $dev | grep -qi "$linkgrep" - if [ $? = 0 ];then + if [ ! -z "$link_unplugged" ];then + if $linkstatus $dev | grep -qi "$link_unplugged"; then + # interface link is not connected, error + return 1 + fi + fi + if $linkstatus $dev | grep -qi "$linkgrep"; then + # interface link is up, success after a paranoid wait :) sleep 1; return 0 fi - if [ $check -eq 30 ];then + if [ $check -eq $retry_count ];then + # interface link did not came up, error return 1 fi Echo "Waiting for link up on ${dev}..." check=$((check + 1)) - sleep 2 + sleep $sleep_timeout done } #====================================== @@ -7449,7 +7474,10 @@ local try_iface=$1 if ip link set dev $try_iface up;then if [ ! $try_iface = "lo" ];then - waitForLinkUp $try_iface + if ! waitForLinkUp $try_iface;then + # link did not came up, not connected ? + return 1 + fi fi # success return 0