commit kiwi for openSUSE:12.2

2 Jul 2012

Hello community,

here is the log from the commit of package kiwi for openSUSE:12.2 checked in at 2012-07-01 15:07:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/kiwi (Old)
 and      /work/SRC/openSUSE:12.2/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kiwi", Maintainer is "ms@suse.com"

Changes:
--------

--- /work/SRC/openSUSE:12.2/kiwi/kiwi.changes	2012-06-28 15:31:26.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.kiwi.new/kiwi.changes	2012-07-02 10:44:14.000000000 +0200
@@ -1,0 +2,30 @@
+Fri Jun 29 21:57:08 CEST 2012 - ms@suse.de
+
+- v5.03.27 released
+  
+-------------------------------------------------------------------
+Fri Jun 29 21:53:27 CEST 2012 - ms@suse.de
+  
+- fixed hybrid persistent writing with kernel 3.x (bnc #769086)
+  
+-------------------------------------------------------------------
+Thu Jun 28 14:11:31 CEST 2012 - ms@suse.de
+  
+- netboot: dhcpcd works with timeout 20s, kiwi used 40s, so one half
+  of the time it waited with no reason. This patch runs 'dhcpcd -T'
+  again after 22s, so the time is used effectively. It also helps in
+  situatios when the link needs more time to start, e.g with
+  wpa_supplicant and the first dhcp packets are lost.
+  
+-------------------------------------------------------------------
+Thu Jun 28 10:19:57 CEST 2012 - rjschwei@suse.de
+  
+- fix the getPXEDeployConfiguration unit test on ppc and ppc64
+  
+-------------------------------------------------------------------
+Wed Jun 27 15:37:22 CEST 2012 - ms@suse.de
+  
+- zypper in 12.2 has been fixed now, so we can change back the
+  JeOS image template to the type="image" installation
+  
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.E8Btdt/_old	2012-07-02 10:44:15.000000000 +0200
+++ /var/tmp/diff_new_pack.E8Btdt/_new	2012-07-02 10:44:15.000000000 +0200
@@ -21,7 +21,7 @@
 Summary:        OpenSuSE - KIWI Image System
 License:        GPL-2.0
 Group:          System/Management
-Version:        5.03.26
+Version:        5.03.27
 Release:        0
 # requirements to build packages
 BuildRequires:  gcc-c++

++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision	2012-06-27 14:36:32.000000000 +0200
+++ new/kiwi/.revision	2012-06-27 14:36:32.000000000 +0200
@@ -1 +1 @@
-405fa428579c5ceaa954a420241f393263fde6e2
+de89ef19625bf365555c3b70e5da39972bda5354
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	2012-06-27 14:36:32.000000000 +0200
+++ new/kiwi/modules/KIWIGlobals.pm	2012-06-29 21:57:48.000000000 +0200
@@ -50,7 +50,7 @@
 	# Globals (generic)
 	#------------------------------------------
 	my %data;
-	$data{Version}         = "5.03.26";
+	$data{Version}         = "5.03.27";
 	$data{Publisher}       = "SUSE LINUX Products GmbH";
 	$data{Preparer}        = "KIWI - http://kiwi.berlios.de";
 	$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	2012-06-27 14:36:32.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh	2012-06-29 21:57:48.000000000 +0200
@@ -3266,7 +3266,17 @@
 	#======================================
 	# store hybrid write partition device
 	#--------------------------------------
-	export HYBRID_RW=$(ddn $biosBootDevice $HYBRID_PERSISTENT_PART)
+	# /.../
+	# use a loop device here because kernel 3.x refuses
+	# to mount a partition if the disk itself was already
+	# mounted. In case of a hybrid iso the disk device
+	# e.g /dev/sda represents the iso and is therefore
+	# mounted in any case. The same trick is used in
+	# createHybridPersistent when creating the filesystem
+	# ----
+	HYBRID_RW=$(ddn $biosBootDevice $HYBRID_PERSISTENT_PART)
+	HYBRID_RW=$(losetup -f --show $HYBRID_RW)
+	export HYBRID_RW
 }
 #======================================
 # CDUmount
@@ -3768,13 +3778,24 @@
 	#======================================
 	# wait for any preferred interface(s)
 	#--------------------------------------
-	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20;do
-		for try_iface in $prefer_iface ; do
-			if [ -s /var/lib/dhcpcd/dhcpcd-$try_iface.info ] &&
-				grep -q "^IPADDR=" /var/lib/dhcpcd/dhcpcd-$try_iface.info
-			then
-				break 2
-			fi
+	for j in 1 2 ;do
+		for i in 1 2 3 4 5 6 7 8 9 10 11;do
+			for try_iface in $prefer_iface ; do
+				if [ -s /var/lib/dhcpcd/dhcpcd-$try_iface.info ] &&
+					grep -q "^IPADDR=" /var/lib/dhcpcd/dhcpcd-$try_iface.info
+				then
+					break 3
+				fi
+			done
+			sleep 2
+		done
+		# /.../
+		# we are behind the dhcpcd timeout 20s so the only thing
+		# we can do now is to try again
+		# ----
+		for try_iface in $DHCPCD_STARTED; do
+			dhcpcd $opts -T $try_iface \
+				> /var/lib/dhcpcd/dhcpcd-$try_iface.info &
 		done
 		sleep 2
 	done
@@ -6650,11 +6671,13 @@
 	#======================================
 	# create filesystem on write partition
 	#--------------------------------------
-	if ! mkfs.$HYBRID_PERSISTENT_FS -L hybrid $(ddn $device $disknr);then
+	local loop_dev=$(losetup -f --show $(ddn $device $disknr))
+	if ! mkfs.$HYBRID_PERSISTENT_FS -L hybrid $loop_dev;then
 		Echo "Failed to create hybrid persistent filesystem"
 		Echo "Persistent writing deactivated"
 		unset kiwi_hybridpersistent
 	fi
+	losetup -d $loop_dev
 }
 #======================================
 # callPartitioner
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-12.2-JeOS/config.xml new/kiwi/template/ix86/suse-12.2-JeOS/config.xml
--- old/kiwi/template/ix86/suse-12.2-JeOS/config.xml	2012-06-27 14:36:32.000000000 +0200
+++ new/kiwi/template/ix86/suse-12.2-JeOS/config.xml	2012-06-29 21:57:48.000000000 +0200
@@ -60,25 +60,19 @@
 	<repository type="yast2">
 		<source path="obs://12.2/repo/oss"/>
 	</repository>
-	<packages type="bootstrap">
+	<packages type="image">
 		<opensusePattern name="base"/>
 		<opensuseProduct name="openSUSE"/>
 		<package name="plymouth-branding-openSUSE" bootinclude="true"/>
 		<package name="ifplugd"/>
 		<package name="iputils"/>
 		<package name="vim"/>
-		<package name="grub"/>
 		<package name="grub2"/>
 		<package name="syslinux"/>
 		<package name="lvm2"/>
 		<package name="plymouth"/>
 		<package name="fontconfig"/>
 		<package name="fonts-config"/>
-		<package name="zypper"/>
-		<package name="cracklib-dict-full"/>
-		<package name="ca-certificates"/>
-		<package name="timezone"/>
-		<package name="glibc-locale"/>
 	</packages>
 	<packages type="iso">
 		<package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/>
@@ -89,14 +83,20 @@
 	<packages type="oem">
 		<package name="grub2-branding-openSUSE" bootinclude="true"/>
 	</packages>
-	<packages type="bootstrap" profiles="xenFlavour">
+	<packages type="image" profiles="xenFlavour">
 		<package name="kernel-xen" replaces="kernel-default"/>
 		<package name="xen-tools" arch="x86_64" replaces=""/>
 		<package name="xen" arch="x86_64" replaces=""/>
 	</packages>
-	<packages type="bootstrap" profiles="vmxFlavour">
+	<packages type="image" profiles="vmxFlavour">
 		<package name="kernel-default" replaces="kernel-xen"/>
 		<package name="kernel-default" replaces="xen-tools"/>
 		<package name="kernel-default" replaces="xen"/>
 	</packages>
+	<packages type="bootstrap">
+		<package name="filesystem"/>
+		<package name="glibc-locale"/>
+		<package name="cracklib-dict-full"/>
+		<package name="ca-certificates"/>
+	</packages>
 </image>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml new/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml
--- old/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml	2012-06-27 14:36:17.000000000 +0200
+++ new/kiwi/tests/unit/data/kiwiXML/pxeSettings/config.xml	2012-06-29 21:57:48.000000000 +0200
@@ -8,7 +8,7 @@
 	<preferences>
 		<type image="pxe" filesystem="clicfs" boot="netboot/suse-12.1" installiso="true">
 			<pxedeploy server="192.168.100.2" blocksize="4096">
-				<configuration arch="x86_64,i686,i586,armv7l,armv7hl,armv5te" dest="target" source="installSource"/>
+				<configuration arch="x86_64,i686,i586,armv7l,armv7hl,armv5te,ppc64,ppc" dest="target" source="installSource"/>
 				<initrd>/pxeSetup/specialInitrd</initrd>
 				<kernel>/pxeSetup/specialKernel</kernel>
 				<partitions device="/dev/sda">

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)