From root@hilbertn.suse.de Fri Mar 10 19:34:26 2017 From: root@hilbertn.suse.de To: commit@lists.opensuse.org Subject: commit kiwi for openSUSE:Factory Date: Fri, 10 Mar 2017 20:34:25 +0100 Message-ID: <20170310193425.7DED5117B6@hilbertn.suse.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0353295382580091139==" --===============0353295382580091139== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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.64926146= 5 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2017-03-10 20:34:17.170= 788705 +0100 @@ -1,0 +2,42 @@ +Tue Feb 21 09:24:11 CET 2017 - ms@suse.de + +- v7.04.28 released + =20 +------------------------------------------------------------------- +Tue Feb 21 09:23:19 CET 2017 - ms@suse.de + =20 +- Wait for network drivers to pass init + =20 + 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 + =20 +------------------------------------------------------------------- +Mon Feb 20 09:31:48 CET 2017 - shshyukriev@suse.com + =20 +- Translated using Weblate (Bulgarian) + =20 + Currently translated at 100.0% (28 of 28 strings) + =20 +------------------------------------------------------------------- +Thu Feb 16 15:40:39 CET 2017 - ms@suse.de + =20 +- Fixed waitForLinkUp and setIPLinkUp + =20 + The setIPLinkUp method did not handle the return value of the + waitForLinkUp call and always returned success even if + waitForLinkUp ran into a timeout + =20 + 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 + =20 +------------------------------------------------------------------- +Thu Feb 9 15:11:10 CET 2017 - fs@suse.de + =20 +- Fixed typo (bsc #984158) + =20 +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 =3D 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc ++++++ kiwi-docu.tar.bz2 ++++++ diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/doc/docbook/xml/kiwi-doc-introduction.xml new/doc/doc= book/xml/kiwi-doc-introduction.xml --- old/doc/docbook/xml/kiwi-doc-introduction.xml 2016-04-18 16:58:06.4742117= 92 +0200 +++ new/doc/docbook/xml/kiwi-doc-introduction.xml 2017-02-09 16:36:31.4230116= 98 +0100 @@ -86,7 +86,7 @@ - Vagrant (.vagrant + Vagrant (.vagrant) @@ -145,9 +145,9 @@ - =20 + -=20 + How to use KIWI? =20 ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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 \n" -"Language-Team: Bulgarian \n" +"PO-Revision-Date: 2017-02-20 09:32+0000\n" +"Last-Translator: Shyukri Shyukriev \n" +"Language-Team: Bulgarian " +"\n" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=3DUTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3D2; plural=3D(n !=3D 1);\n" -"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=3D2; plural=3Dn !=3D 1;\n" +"X-Generator: Weblate 2.6\n" =20 #. /.../ #. Copyright (c) 2005 SuSE GmbH Nuernberg, Germany. All rights reserved. @@ -21,7 +22,7 @@ #. boot code for KIWI=20 #. msgid "Boot continues in 10 sec" -msgstr "" +msgstr "=D0=A1=D1=82=D0=B0=D1=80=D1=82=D0=B8=D1=80=D0=B0=D0=BD=D0=B5=D1=82= =D0=BE =D0=BF=D1=80=D0=BE=D0=B4=D1=8A=D0=BB=D0=B6=D0=B0=D0=B2=D0=B0 10 =D1=81= =D0=B5=D0=BA=D1=83=D0=BD=D0=B4=D0=B8" =20 msgid "Enter LUKS passphrase" msgstr "=D0=92=D1=8A=D0=B2=D0=B5=D0=B4=D0=B5=D1=82=D0=B5 LUKS =D0=BF=D0=B0= =D1=80=D0=BE=D0=BB=D0=BD=D0=B0 =D1=84=D1=80=D0=B0=D0=B7=D0=B0" @@ -77,12 +78,14 @@ msgstr "=D0=98=D0=B7=D1=85=D0=BE=D0=B4" =20 msgid "Bootloader installation has failed" -msgstr "" +msgstr "Bootloader =D0=B8=D0=BD=D1=81=D1=82=D0=B0=D0=BB=D0=B0=D1=86=D0=B8=D1= =8F=D1=82=D0=B0 =D0=B5 =D0=BD=D0=B5=D1=83=D1=81=D0=BF=D0=B5=D1=88=D0=BD=D0=B0" =20 msgid "" "The system will not be able to reboot. Please make sure to fixup and instal= l " "the bootloader before next reboot. Check /var/log/boot.kiwi for details" msgstr "" +"=D0=A1=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=B0=D1=82=D0=B5 =D0=BD=D0=B5 =D0=BC= =D0=BE=D0=B6=D0=B5 =D0=B4=D0=B0 =D1=81=D0=B5 =D1=80=D0=B5=D1=81=D1=82=D1=80= =D0=B0=D1=82=D0=B8=D1=80=D0=B0. =D0=9C=D0=BE=D0=BB=D1=8F =D0=BE=D1=82=D1=81= =D1=82=D1=80=D0=B0=D0=BD=D0=B5=D1=82=D0=B5 =D0=B3=D1=80=D0=B5=D1=88=D0=BA=D0= =B8=D1=82=D0=B5 =D0=B8 =D0=B8=D0=BD=D1=81=D1=82=D0=B0=D0=BB=D0=B8=D1=80=D0=B0= =D0=B9=D1=82=D0=B5 " +"bootloader =D0=BF=D1=80=D0=B5=D0=B4=D0=B8 =D1=81=D0=BB=D0=B5=D0=B4=D0=B2=D0= =B0=D1=89 =D1=80=D0=B5=D1=81=D1=82=D0=B0=D1=80=D1=82. =D0=92=D0=B8=D0=B6=D1= =82=D0=B5 =D0=B4=D0=B5=D1=82=D0=B0=D0=B9=D0=BB=D0=B8 =D0=BD=D0=B0 /var/log/bo= ot.kiwi" =20 msgid "Please remove the CD/DVD before reboot" msgstr "=D0=9C=D0=BE=D0=BB=D1=8F, =D0=B8=D0=B7=D0=B2=D0=B0=D0=B4=D0=B5=D1=82= =D0=B5 CD/DVD-=D1=82=D0=BE =D0=BF=D1=80=D0=B5=D0=B4=D0=B8 =D0=B4=D0=B0 =D1=80= =D0=B5=D1=81=D1=82=D0=B0=D1=80=D1=82=D0=B8=D1=80=D0=B0=D1=82=D0=B5" @@ -108,8 +111,7 @@ msgstr "=D0=98=D0=B7=D0=B1=D0=B5=D1=80=D0=B5=D1=82=D0=B5 %1 =D0=B4=D1=8F=D0= =BB =D0=B7=D0=B0 =D0=B8=D0=BD=D1=81=D1=82=D0=B0=D0=BB=D0=B0=D1=86=D0=B8=D1=8F= =D1=82=D0=B0:" =20 msgid "System will be shutdown. Remove USB stick before power on" -msgstr "" +msgstr "=D0=A1=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=B0=D1=82=D0=B0 =D1=89=D0=B5 = =D1=81=D0=B5 =D0=B8=D0=B7=D0=BA=D0=BB=D1=8E=D1=87=D0=B8. =D0=9F=D1=80=D0=B5= =D0=BC=D0=B0=D1=85=D0=BD=D0=B5=D1=82=D0=B5 USB =D1=83=D1=81=D1=82=D1=80=D0=BE= =D0=B9=D1=81=D1=82=D0=B2=D0=BE=D1=82=D0=BE =D0=BF=D1=80=D0=B5=D0=B4=D0=B8 =D1= =81=D1=82=D0=B0=D1=80=D1=82=D0=B8=D1=80=D0=B0=D0=BD=D0=B5" =20 -#, fuzzy msgid "Please remove the CD/DVD before shutdown" -msgstr "=D0=9C=D0=BE=D0=BB=D1=8F, =D0=B8=D0=B7=D0=B2=D0=B0=D0=B4=D0=B5=D1=82= =D0=B5 CD/DVD-=D1=82=D0=BE =D0=BF=D1=80=D0=B5=D0=B4=D0=B8 =D0=B4=D0=B0 =D1=80= =D0=B5=D1=81=D1=82=D0=B0=D1=80=D1=82=D0=B8=D1=80=D0=B0=D1=82=D0=B5" +msgstr "=D0=9C=D0=BE=D0=BB=D1=8F, =D0=B8=D0=B7=D0=B2=D0=B0=D0=B4=D0=B5=D1=82= =D0=B5 CD/DVD-=D1=82=D0=BE =D0=BF=D1=80=D0=B5=D0=B4=D0=B8 =D0=B4=D0=B0 =D0=B8= =D0=B7=D0=BA=D0=BB=D1=8E=D1=87=D0=B8=D1=82=D0=B5" diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlob= als.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} =3D "7.04.27"; + $data{Version} =3D "7.04.28"; $data{Publisher} =3D "SUSE LINUX GmbH"; $data{Preparer} =3D "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} =3D "config.xml"; diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinu= xRC.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=3D$IFS_ORIG local dev=3D$1 local check=3D0 - if [ -x /usr/sbin/ifplugstatus ]; then + local linkstatus + local linkgrep + local link_unplugged + local sleep_timeout=3D2 + local retry_count=3D30 + #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + # 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 + #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + # Lookup link status... + #-------------------------------------- + if lookup ifplugstatus &>/dev/null;then linkstatus=3Difplugstatus linkgrep=3D"link beat detected" + link_unplugged=3D"unplugged" else - linkstatus=3D"ip link ls"=20 + linkstatus=3D"ip link ls" linkgrep=3D"state UP" fi while true;do - $linkstatus $dev | grep -qi "$linkgrep" - if [ $? =3D 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=3D$((check + 1)) - sleep 2 + sleep $sleep_timeout done } #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -7449,7 +7474,10 @@ local try_iface=3D$1 if ip link set dev $try_iface up;then if [ ! $try_iface =3D "lo" ];then - waitForLinkUp $try_iface + if ! waitForLinkUp $try_iface;then + # link did not came up, not connected ? + return 1 + fi fi # success return 0 --===============0353295382580091139==--