Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Fri Oct 7 00:48:40 CEST 2011.
-------- --- openSUSE:Factory/kiwi/kiwi.changes 2011-10-06 17:23:02.000000000 +0200 +++ kiwi/kiwi.changes 2011-10-06 18:02:42.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 6 17:56:52 CEST 2011 - [email protected] + +- fixed race conditions in LOCAL_BOOT=yes code, we have to + wait for the $disk device to appear before acting on it + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-10-03 00:00:06.000000000 +0200 +++ new/kiwi/.revision 2011-10-03 00:00:06.000000000 +0200 @@ -1 +1 @@ -ce16c5e467e8871a162a59cbcaeb212534b44774 +63c33a0efc290682aebeb681a06b7665f96f1dda 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 2011-10-06 12:21:56.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-10-06 17:59:01.000000000 +0200 @@ -2761,15 +2761,14 @@ function waitForUSBDeviceScan { local devices=0 local s1="usb-storage: device scan complete" - local s2="usbcore: registered new interface driver usb-storage" if [ ! "$HAVE_USB" = "yes" ];then return fi if [ ! "$SCAN_USB" = "complete" ];then Echo -n "Waiting for USB device scan to complete..." while \ - [ $(dmesg|grep -c -E "$s1|$s2") -lt 1 ] && \ - [ $devices -lt 15 ] + [ $(dmesg|grep -c -E "$s1") -lt 1 ] && \ + [ $devices -lt 8 ] do echo -n . sleep 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-linuxrc new/kiwi/system/boot/ix86/oemboot/suse-linuxrc --- old/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2011-10-06 12:21:56.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2011-10-06 17:59:01.000000000 +0200 @@ -228,6 +228,7 @@ fi export imageDiskDevice=$biosBootDevice else + waitForStorageDevice $disk export imageDiskDevice=$(dn $disk) if [ ! -z "$KIWI_RECOVERY" ];then export imageRecoveryDevice=$(ddn $imageDiskDevice $KIWI_RECOVERY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc --- old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2011-10-03 00:00:07.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2011-10-06 17:59:01.000000000 +0200 @@ -132,6 +132,7 @@ fi export imageDiskDevice=$biosBootDevice else + waitForStorageDevice $disk export imageDiskDevice=$(dn $disk) fi Echo "Found boot device: $imageDiskDevice" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-linuxrc new/kiwi/system/boot/ppc/oemboot/suse-linuxrc --- old/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2011-10-03 00:00:07.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2011-10-06 17:59:01.000000000 +0200 @@ -221,6 +221,7 @@ fi export imageDiskDevice=$biosBootDevice else + waitForStorageDevice $disk export imageDiskDevice=$(dn $disk) if [ ! -z "$KIWI_RECOVERY" ];then export imageRecoveryDevice=$(ddn $imageDiskDevice $KIWI_RECOVERY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc --- old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2011-10-03 00:00:07.000000000 +0200 +++ new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2011-10-06 17:59:01.000000000 +0200 @@ -133,6 +133,7 @@ fi export imageDiskDevice=$biosBootDevice else + waitForStorageDevice $disk export imageDiskDevice=$(dn $disk) fi Echo "Found boot device: $imageDiskDevice" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-linuxrc new/kiwi/system/boot/s390/oemboot/suse-linuxrc --- old/kiwi/system/boot/s390/oemboot/suse-linuxrc 2011-10-03 00:00:07.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2011-10-06 17:59:01.000000000 +0200 @@ -225,6 +225,7 @@ fi export imageDiskDevice=$biosBootDevice else + waitForStorageDevice $disk export imageDiskDevice=$(dn $disk) if [ ! -z "$KIWI_RECOVERY" ];then export imageRecoveryDevice=$(ddn $imageDiskDevice $KIWI_RECOVERY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-linuxrc new/kiwi/system/boot/s390/vmxboot/suse-linuxrc --- old/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2011-10-03 00:00:08.000000000 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2011-10-06 17:59:01.000000000 +0200 @@ -136,6 +136,7 @@ fi export imageDiskDevice=$biosBootDevice else + waitForStorageDevice $disk export imageDiskDevice=$(dn $disk) fi Echo "Found boot device: $imageDiskDevice" continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
