Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2016-10-01 23:45:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-05 21:16:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2016-10-01 23:46:41.000000000 +0200 @@ -1,0 +2,48 @@ +Mon Sep 19 10:53:24 CEST 2016 - [email protected] + +- v7.03.95 released + +------------------------------------------------------------------- +Mon Sep 19 10:52:38 CEST 2016 - [email protected] + +- v7.03.94 released + +------------------------------------------------------------------- +Sun Sep 18 15:47:41 CEST 2016 - [email protected] + +- tab to spaces + +------------------------------------------------------------------- +Sun Sep 18 15:44:54 CEST 2016 - [email protected] + +- ip link ls output is unreliable on some interfaces, when available use ifplugstatus instead + +------------------------------------------------------------------- +Thu Sep 15 14:45:21 CEST 2016 - [email protected] + +- v7.03.93 released + +------------------------------------------------------------------- +Thu Sep 15 14:11:20 CEST 2016 - [email protected] + +- Revert "waitForStorageDevice patch" + + The logic to setup a wait timeout by asking a device property + from a device which does not yet exist raises a chicken and egg + problem. This reverts commit 9654d53e3c4a500a4e3a7e5cc8d40a56e0da6525. + +------------------------------------------------------------------- +Thu Sep 15 11:10:02 CEST 2016 - [email protected] + +- Follow up fix for setupNetworkWicked + + IP address information from wicked is imported twice. + However the plain IPv4 address validation happened only + on the first import. Fixes bnc#992989 + +------------------------------------------------------------------- +Sun Sep 11 21:07:04 CEST 2016 - [email protected] + +- Fixed message typo (bnc#996255) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.letW9U/_old 2016-10-01 23:46:43.000000000 +0200 +++ /var/tmp/diff_new_pack.letW9U/_new 2016-10-01 23:46:43.000000000 +0200 @@ -27,7 +27,7 @@ Name: kiwi License: GPL-2.0 Group: System/Management -Version: 7.03.92 +Version: 7.03.95 Provides: kiwi-schema = 6.2 Provides: kiwi-image:aci Provides: kiwi-image:lxc ++++++ kiwi-docu.tar.bz2 ++++++ ++++ 18075 lines of diff (skipped) ++++++ 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.000000000 +0200 +++ new/kiwi/.revision 2016-01-01 17:37:14.000000000 +0100 @@ -1 +1 @@ -5da0b0d1df83988d88c014c36dbb58ddfab96fa9 +73910689f1ec8e634ae790833e797bae2941c579 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/metadata/KIWIConfig.xml new/kiwi/metadata/KIWIConfig.xml --- old/kiwi/metadata/KIWIConfig.xml 2016-04-18 16:58:06.000000000 +0200 +++ new/kiwi/metadata/KIWIConfig.xml 2016-09-19 10:52:25.000000000 +0200 @@ -131,6 +131,7 @@ <file name="init"/> <file name="insmod"/> <file name="id"/> + <file name="ifplugstatus"/> <file name="iucv_configure"/> <file name="kexec"/> <file name="kill"/> 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-08-25 14:36:22.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2016-09-19 10:53:19.000000000 +0200 @@ -2018,7 +2018,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "7.03.92"; + $data{Version} = "7.03.95"; $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 2016-08-24 16:10:45.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2016-09-19 10:52:25.000000000 +0200 @@ -1375,7 +1375,7 @@ return 1 fi else - Echo "No bootloader installaton required" + Echo "No bootloader installation required" fi return 0 } @@ -5291,6 +5291,7 @@ dhcp_info=/var/run/wicked/wicked-${PXE_IFACE}.info if [ -s $dhcp_info ]; then importFile < /var/run/wicked/wicked-${PXE_IFACE}.info + IPADDR=$(echo $IPADDR | cut -f1 -d/) fi } #====================================== @@ -7394,21 +7395,6 @@ fi } #====================================== -# getDeviceTransportType -#-------------------------------------- -function getDeviceTransportType { - # /.../ - # function to get the transport type of the - # given device. It uses lsblk command. - # ---- - local device=$1 - if [ -z "$device" ] || [ ! -e "$device" ]; then - echo 1; return 1; - fi - local disk=${device%%[0-9]*} - echo $(lsblk -dno tran $disk) -} -#====================================== # waitForStorageDevice #-------------------------------------- function waitForStorageDevice { @@ -7416,30 +7402,19 @@ # function to check access on a storage device # which could be a whole disk or a partition. # the function will wait until the size of the - # storage device could be obtained or the timeout - # is reached. + # storage device could be obtained or the check + # counter equals 4 # ---- local IFS=$IFS_ORIG local device=$1 local check=0 - local transport=$(getDeviceTransportType $device) - case "$transport" in - "usb") - # Counter limit=2 means 4 seconds timeout - limit=2 - ;; - *) - # Counter limit=30 means 60 seconds timeout - limit=30 - ;; - esac udevPending while true;do partitionSize $device &>/dev/null if [ $? = 0 ];then sleep 1; return 0 fi - if [ $check -eq $limit ]; then + if [ $check -eq 30 ];then return 1 fi Echo "Waiting for storage device $device to settle..." @@ -7457,8 +7432,15 @@ local IFS=$IFS_ORIG local dev=$1 local check=0 + if [ -x /usr/sbin/ifplugstatus ]; then + linkstatus=ifplugstatus + linkgrep="link beat detected" + else + linkstatus="ip link ls" + linkgrep="state UP" + fi while true;do - ip link ls $dev | grep -qi "state UP" + $linkstatus $dev | grep -qi "$linkgrep" if [ $? = 0 ];then sleep 1; return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-tumbleweed/config.xml new/kiwi/system/boot/ix86/netboot/suse-tumbleweed/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-tumbleweed/config.xml 2016-04-18 16:58:06.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-tumbleweed/config.xml 2016-09-19 10:52:25.000000000 +0200 @@ -196,6 +196,7 @@ <package name="psmisc"/> <package name="sysvinit-tools"/> <package name="e2fsprogs"/> + <package name="ifplugd"/> </packages> <packages type="delete" profiles="default,diskless,xen"> <package name="cracklib-dict-full"/>
