commit kiwi for openSUSE:12.1

8 Nov 2011

Hello community,

here is the log from the commit of package kiwi for openSUSE:12.1 checked in at 2011-11-08 17:38:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/kiwi (Old)
 and      /work/SRC/openSUSE:12.1/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

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

Changes:
--------

--- /work/SRC/openSUSE:12.1/kiwi/kiwi.changes	2011-10-29 00:23:16.000000000 +0200
+++ /work/SRC/openSUSE:12.1/.kiwi.new/kiwi.changes	2011-11-08 17:38:53.000000000 +0100
@@ -1,0 +2,166 @@
+Tue Nov  8 16:18:06 CET 2011 - ms@suse.de
+  
+- removed dead code in iso boot code due to the removal of
+  the swap file support (bnc #728645)
+  
+-------------------------------------------------------------------
+Tue Nov  8 15:28:32 CET 2011 - ms@suse.de
+  
+- added options --xattrs and --acls when using rsync
+  
+-------------------------------------------------------------------
+Tue Nov  8 11:47:16 CET 2011 - ms@suse.de
+  
+- use mktemp to create tmp dir in setupInstallFlags
+  
+-------------------------------------------------------------------
+Tue Nov  8 10:21:04 CET 2011 - ms@suse.de
+  
+- v4.98.15 released
+  
+-------------------------------------------------------------------
+Mon Nov  7 12:46:53 CET 2011 - ms@suse.de
+  
+- make sure importFile() stays backward compatible and ensures
+  proper quoting. Also make sure the prefixed variable copy is
+  only created if a prefix was set (bnc #728357)
+  
+-------------------------------------------------------------------
+Mon Nov  7 11:49:26 CET 2011 - ms@suse.de
+  
+- switch from tar to rsync based copies. Reason for the change is
+  because tar doesn't support file attributes like xattr,acls
+  and fscaps (bnc #728312)
+  
+-------------------------------------------------------------------
+Mon Nov  7 09:30:11 CET 2011 - ms@suse.de
+  
+- don't create a swap file if no swap partition can be found in
+  the live iso boot code. people complained about the creation
+  of swap files while this is not expected.
+  
+-------------------------------------------------------------------
+Sun Nov  6 20:35:13 CET 2011 - ms@suse.de
+  
+- fixed setupNetworkInterfaceS390 qeth_configure execution
+- added setupNetworkInterfaceS390 to s390 netboot preinit
+  to create the relevant udev rules
+  
+-------------------------------------------------------------------
+Thu Nov  3 12:24:20 CET 2011 - ms@suse.de
+  
+- v4.98.14 released
+  
+-------------------------------------------------------------------
+Thu Nov  3 11:35:37 CET 2011 - ms@suse.de
+  
+- fixed check for empty variable in shell code
+  
+-------------------------------------------------------------------
+Thu Nov  3 09:51:50 CET 2011 - ms@suse.de
+  
+- v4.98.13 released
+  
+-------------------------------------------------------------------
+Thu Nov  3 09:41:38 CET 2011 - ms@suse.de
+  
+- setupDefaultGateway uses route but route was not part of the initrd
+  
+-------------------------------------------------------------------
+Thu Nov  3 09:38:04 CET 2011 - ms@suse.de
+  
+- fdasdGetPartitionID uses awk but awk was not part of the initrd
+  
+-------------------------------------------------------------------
+Thu Nov  3 09:14:43 CET 2011 - ms@suse.de
+  
+- moved hook calls pre/postpartition outside of the block
+  which allows to skip the partition code via the hook
+  script
+  
+-------------------------------------------------------------------
+Wed Nov  2 12:10:29 CET 2011 - ms@suse.de
+  
+- fixed repartition code to create an aligned table (bnc #721580)
+  
+-------------------------------------------------------------------
+Mon Oct 31 16:49:05 CET 2011 - ms@suse.de
+  
+- setup PXE_IFACE interface only if PXE_IFACE exists in the
+  environment. When using zPXE this variable does not exist
+  
+-------------------------------------------------------------------
+Mon Oct 31 16:23:18 CET 2011 - ms@suse.de
+  
+- fixed setupNetworkStatic to write correct interface file
+  
+-------------------------------------------------------------------
+Mon Oct 31 16:13:05 CET 2011 - ms@suse.de
+  
+- removed static inittab and securetty overlay files from s390
+  JeOS template. The setup is done by setupConsole() in preinit
+  
+-------------------------------------------------------------------
+Mon Oct 31 16:09:35 CET 2011 - ms@suse.de
+  
+- call runPreinitServices in s390 netboot suse-preinit
+  
+-------------------------------------------------------------------
+Mon Oct 31 15:48:09 CET 2011 - ms@suse.de
+  
+- turn pxe PART info tranformation functions into a generic
+  and a fdasd specific function
+  
+-------------------------------------------------------------------
+Mon Oct 31 15:38:51 CET 2011 - ms@suse.de
+  
+- added pxePartitionInputS390 suitable for use with fdasd
+  
+-------------------------------------------------------------------
+Mon Oct 31 15:04:13 CET 2011 - ms@suse.de
+  
+- added pxeRaidPartitionInputS390 suitable for use with fdasd
+  
+-------------------------------------------------------------------
+Mon Oct 31 10:24:10 CET 2011 - ms@suse.de
+  
+- v4.98.12 released
+  
+-------------------------------------------------------------------
+Mon Oct 31 09:52:52 CET 2011 - ms@suse.de
+  
+- s390 netboot:
+* make sure the VTOC table is created prior to any fdasd call
+* make sure searchBusIDBootDevice is called to set the device
+  in $DISK online by a custom DEVICE_INIT command
+  
+-------------------------------------------------------------------
+Mon Oct 31 09:52:22 CET 2011 - ms@suse.de
+  
+- added support for custom s390 device init command in the
+  searchBusIDBootDevice function. This is required if the s390
+  client was not booted by an ipl command but e.g. via zPXE
+  
+-------------------------------------------------------------------
+Sun Oct 30 20:37:49 CET 2011 - ms@suse.de
+  
+- fixed migration code:
+* fixed creation of URL list from zypper information
+* write current schema version (5.3) XML
+* fixed creation of KIWISatSolver objects
+  
+-------------------------------------------------------------------
+Sat Oct 29 22:42:36 CEST 2011 - ms@suse.de
+  
+- added support for Microsoft Hyper-V machine image format
+  . This requires a qemu version
+  which supports the vpc format conversion (fate# 309765)
+  
+-------------------------------------------------------------------
+Sat Oct 29 22:34:28 CEST 2011 - ms@suse.de
+  
+- fixed migration module to work again. Added 11.4 and 12.1 paths
+  and make sure the global object pointer is there when it is
+  accessed
+  
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.KZEknM/_old	2011-11-08 17:38:54.000000000 +0100
+++ /var/tmp/diff_new_pack.KZEknM/_new	2011-11-08 17:38:54.000000000 +0100
@@ -55,7 +55,7 @@
 Requires:       perl = %{perl_version}
 Requires:       perl-XML-LibXML perl-libwww-perl screen coreutils
 Requires:       perl-XML-LibXML-Common perl-XML-SAX perl-Config-IniFiles
-Requires:       kiwi-tools libxslt checkmedia util-linux
+Requires:       kiwi-tools libxslt checkmedia util-linux rsync
 %if %{suse_version} > 1030
 Requires:       satsolver-tools
 %endif
@@ -69,7 +69,7 @@
 %endif
 %endif
 Summary:        OpenSuSE - KIWI Image System
-Version:        4.98.11
+Version:        4.98.15
 Release:        1
 Group:          System/Management
 License:        GPLv2

++++++ kiwi-docu.tar.bz2 ++++++
/work/SRC/openSUSE:12.1/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:12.1/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1

++++++ 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	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/.revision	2011-11-08 16:21:40.000000000 +0100
@@ -1 +1 @@
-09f7ec7b6a79943153207fd6ed51275a7441ab1f
+5f6c38df848ddb7a72a27d786bc29ba598ab7119
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/kiwi.pl	2011-11-08 16:21:40.000000000 +0100
@@ -1336,7 +1336,7 @@
 	print "    kiwi --installstick <initrd>\n";
 	print "       [ --installstick-system <vmx-system-image> ]\n";
 	print "Image format conversion:\n";
-	print "    kiwi --convert <systemImage> [ --format  ]\n";
+	print "    kiwi --convert <systemImage> [ --format  ]\n";
 	print "Helper Tools:\n";
 	print "    kiwi --createpassword\n";
 	print "    kiwi --createhash <image-path>\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm
--- old/kiwi/modules/KIWIBoot.pm	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/modules/KIWIBoot.pm	2011-11-08 16:21:40.000000000 +0100
@@ -2214,9 +2214,7 @@
 		# Copy root tree to disk
 		#------------------------------------------
 		$kiwi -> info ("Copying system image tree on disk");
-		$status = qxx (
-			"tar --one-file-system -cf - -C $system . | tar -x -C $loopdir 2>&1"
-		);
+		$status = qxx ("rsync -aHXA --one-file-system $system/ $loopdir 2>&1");
 		$result = $? >> 8;
 		if ($result != 0) {
 			$kiwi -> failed ();
@@ -2525,12 +2523,13 @@
 	my $kiwi   = $this->{kiwi};
 	my $initrd = $this->{initrd};
 	my $system = $this->{system};
-	my $irddir = $initrd."_".$$.".vmxsystem";
 	my $xml    = $this->{xml};
 	my $zipper = $this->{gdata}->{Gzip};
 	my $newird;
-	if (! mkdir $irddir) {
-		$kiwi -> error  ("Failed to create vmxsystem directory");
+	my $irddir = qxx ("mktemp -q -d /tmp/kiwiird.XXXXXX"); chomp $irddir;
+	my $result = $? >> 8;
+	if ($result != 0) {
+		$kiwi -> error  ("Couldn't create tmp dir: $irddir: $!");
 		$kiwi -> failed ();
 		return undef;
 	}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh
--- old/kiwi/modules/KIWIConfig.sh	2011-10-28 13:59:39.000000000 +0200
+++ new/kiwi/modules/KIWIConfig.sh	2011-11-08 16:21:40.000000000 +0100
@@ -986,6 +986,7 @@
 		qeth_configure fdasd mkdosfs egrep mkfs.xfs mdadm yes fdisk
 		startproc zfcp_host_configure zfcp_disk_configure vgrename
 		kpartx_id mpath_id dmraid dmevent_tool which mpath_wait seq
+		route
 	"
 	tools="$tools $@"
 	for path in /sbin /usr/sbin /usr/bin /bin;do
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	2011-10-28 13:59:39.000000000 +0200
+++ new/kiwi/modules/KIWIGlobals.pm	2011-11-08 16:21:40.000000000 +0100
@@ -40,7 +40,7 @@
 	# Globals (generic)
 	#------------------------------------------
 	my %data;
-	$data{Version}         = "4.98.11";
+	$data{Version}         = "4.98.15";
 	$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/KIWIImage.pm new/kiwi/modules/KIWIImage.pm
--- old/kiwi/modules/KIWIImage.pm	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/modules/KIWIImage.pm	2011-11-08 16:21:40.000000000 +0100
@@ -3241,13 +3241,11 @@
 	$kiwi -> info ("Copying physical to logical [$name]...");
 	my $free = qxx ("df -h $extend 2>&1");
 	$kiwi -> loginfo ("getSize: mount: $free\n");
-	my $data = qxx (
-		"tar --one-file-system -cf - -C $source . | tar -x -C $extend 2>&1"
-	);
+	my $data = qxx ("rsync -aHXA --one-file-system $source/ $extend 2>&1");
 	my $code = $? >> 8;
 	if ($code != 0) {
 		$kiwi -> failed ();
-		$kiwi -> info   ("tar based copy failed: $data");
+		$kiwi -> info   ("rsync based copy failed: $data");
 		$kiwi -> failed ();
 		$this -> cleanMount();
 		return undef;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm
--- old/kiwi/modules/KIWIImageFormat.pm	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/modules/KIWIImageFormat.pm	2011-11-08 16:21:40.000000000 +0100
@@ -155,6 +155,9 @@
 	if ($format eq "vmdk") {
 		$kiwi -> info ("Starting raw => $format conversion\n");
 		return $this -> createVMDK();
+	} elsif ($format eq "vpc") {
+		$kiwi -> info ("Starting raw => $format conversion\n");
+		return $this -> createVPC();
 	} elsif ($format eq "ovf") {
 		$kiwi -> info ("Starting raw => $format conversion\n");
 		return $this -> createOVF();
@@ -319,28 +322,19 @@
 }
 
 #==========================================
+# createVPC
+#------------------------------------------
+sub createVPC {
+	my $this   = shift;
+	return $this -> createVMDK();
+}
+
+#==========================================
 # createQCOW2
 #------------------------------------------
 sub createQCOW2 {
 	my $this   = shift;
-	my $kiwi   = $this->{kiwi};
-	my $format = $this->{format};
-	my $source = $this->{image};
-	my $target = $source;
-	my $status;
-	my $result;
-	$kiwi -> info ("Creating $format image...");
-	$target  =~ s/\.raw$/\.$format/;
-	$status = qxx ("qemu-img convert -f raw $source -O $format $target 2>&1");
-	$result = $? >> 8;
-	if ($result != 0) {
-		$kiwi -> failed ();
-		$kiwi -> error  ("Couldn't create $format image: $status");
-		$kiwi -> failed ();
-		return undef;
-	}
-	$kiwi -> done ();
-	return $target;
+	return $this -> createVMDK();
 }
 
 #==========================================
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-28 13:59:39.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh	2011-11-08 16:21:40.000000000 +0100
@@ -231,11 +231,19 @@
 	# ----
 	local prefix=$1
 	cat - | grep -v ^# > /tmp/srcme
+	# remove start/stop quoting from values
+	sed -i -e s"#\(^[a-zA-Z0-9_]\+\)=[\"']\(.*\)[\"']#\1=\2#" /tmp/srcme
+	# remove backslash quotes if any
+	sed -i -e s"#\\\\\(.\)#\1#g" /tmp/srcme
+	# quote simple quotation marks
+	sed -i -e s"#'#'\\\\''#g" /tmp/srcme
+	# add '...' quoting to values
+	sed -i -e s"#\(^[a-zA-Z0-9_]\+\)=\(.*\)#\1='\2'#" /tmp/srcme
 	source /tmp/srcme
 	while read line;do
 		key=$(echo "$line" | cut -d '=' -f1)
 		eval "export $key"
-		eval "export $prefix$key=\$$key"
+		test -z "$prefix" || eval "export $prefix$key=\$$key"
 	done < /tmp/srcme
 	if [ ! -z "$ERROR_INTERRUPT" ];then
 		Echo -e "$ERROR_INTERRUPT"
@@ -2335,6 +2343,9 @@
 	# create the /sysconfig/network file according to the PXE
 	# boot interface.
 	# ----
+	if [ -z "$PXE_IFACE" ];then
+		return
+	fi
 	local prefix=$1
 	local niface=$prefix/etc/sysconfig/network/ifcfg-$PXE_IFACE
 	mkdir -p $prefix/etc/sysconfig/network
@@ -3411,6 +3422,17 @@
 	local wwpn
 	local slun
 	#======================================
+	# check for custom device init command
+	#--------------------------------------
+	if [ ! -z "$DEVICE_INIT" ];then
+		if ! eval $DEVICE_INIT;then
+			export biosBootDevice="Failed to call: $DEVICE_INIT"
+			return 1
+		fi
+		export biosBootDevice=$DISK
+		return 0
+	fi
+	#======================================
 	# determine device type: dasd or zfcp
 	#--------------------------------------
 	if [ -z "$ipl_type" ];then
@@ -3670,32 +3692,6 @@
 	done
 }
 #======================================
-# searchDiskSpace
-#--------------------------------------
-function searchDiskSpace {
-	# /.../
-	# search for a free non swap partition
-	# ----
-	if [ ! -z $kiwinoswapsearch ];then
-		return
-	fi
-	local hwapp=/usr/sbin/hwinfo
-	local diskdevs=`$hwapp --disk | grep "Device File:" | cut -f2 -d:`
-	diskdevs=`echo $diskdevs | sed -e "s@(.*)@@"`
-	for diskdev in $diskdevs;do
-		for disknr in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15;do
-			id=`partitionID $diskdev $disknr`
-			if [ -z $id ];then
-				id=0
-			fi
-			if [ "$id" -ne 82 ] && [ "$id" -ne 0 ];then
-				echo $diskdev$disknr
-				return
-			fi
-		done
-	done
-}
-#======================================
 # updateMTAB
 #--------------------------------------
 function updateMTAB {
@@ -3922,16 +3918,16 @@
 				qeth_cmd="$qeth_cmd -l"
 			fi
 			if [ -n "$portname" ];then
-				qeth_cmd="$qeth_cmd -p$portname"
+				qeth_cmd="$qeth_cmd -p $portname"
 			fi
 			if [ -n "$portno" ];then
-				qeth_cmd="$qeth_cmd -n$portno"
+				qeth_cmd="$qeth_cmd -n $portno"
 			fi
 			qeth_cmd="$qeth_cmd $readchannel $writechannel"
 			if [ -n "$datachannel" ];then
 				qeth_cmd="$qeth_cmd $datachannel"
 			fi
-			$qeth_cmd 1
+			eval $qeth_cmd 1
 			;;
 		"ctc")
 			/sbin/ctc_configure $readchannel $writechannel 1 $ctcprotocol
@@ -3949,6 +3945,7 @@
 			"Failed to bring up the network: $instnetdev" \
 		"reboot"
 	fi
+	udevPending
 }
 #======================================
 # convertCIDRToNetmask
@@ -3994,7 +3991,7 @@
 		hostip=$(echo $hostip | cut -f1 -d/)
 		netmask=$(convertCIDRToNetmask $cidr)
 	fi
-	if [ "$up" == "1" ];then
+	if [ "$up" = "1" ];then
 		#======================================
 		# activate network
 		#--------------------------------------
@@ -4013,11 +4010,12 @@
 		if [ ! $? = 0 ];then
 			systemException "Failed to set up the network: $iface" "reboot"
 		fi
-	else
+		export iface_static=$iface
+	elif [ ! -z $iface_static ];then
 		#======================================
 		# write network setup
 		#--------------------------------------
-		local netFile="/etc/sysconfig/network/ifcfg-$iface"
+		local netFile="/etc/sysconfig/network/ifcfg-$iface_static"
 		echo "BOOTPROTO='static'" > $netFile
 		echo "STARTMODE='auto'" >> $netFile
 		echo "IPADDR='$hostip'" >> $netFile
@@ -4176,7 +4174,7 @@
 function fdasdGetPartitionID {
 	local count=1
 	for i in $(fdasd -s -p $1 | grep -E '^[ ]+\/' |\
-		 awk -v OFS=":" '$1=$1' | cut -f5 -d:);do
+		awk -v OFS=":" '$1=$1' | cut -f5 -d:);do
 		if [ $count = $2 ];then
 			if $i = 2;then
 				echo 82
@@ -6773,7 +6771,7 @@
 #--------------------------------------
 function partedSectorInit {
 	# /.../
-	# return start/end sectors of current partitions.
+	# return aligned start/end sectors of current table.
 	# ----
 	IFS=$IFS_ORIG
 	local disk=$1
@@ -6792,14 +6790,11 @@
 			startSectors=${startSectors}:${s_start}s
 		fi
 		if [ -z "$endSectors" ];then
-			endSectors=$((s_stopp + 1))s
+			endSectors=$((s_stopp/8*8+8))s
 		else
-			endSectors=$endSectors:$((s_stopp + 1))s
+			endSectors=$endSectors:$((s_stopp/8*8+8))s
 		fi
 	done
-	if [ -z "$startSectors" ];then
-		startSectors=1
-	fi
 }
 #======================================
 # partedEndCylinder
@@ -7328,6 +7323,66 @@
 # pxePartitionInput
 #--------------------------------------
 function pxePartitionInput {
+	if [ $PARTITIONER = "fdasd" ];then
+		pxePartitionInputFDASD
+	else
+		pxePartitionInputGeneric
+	fi
+}
+#======================================
+# pxeRaidPartitionInput
+#--------------------------------------
+function pxeRaidPartitionInput {
+	if [ $PARTITIONER = "fdasd" ];then
+		pxeRaidPartitionInputFDASD
+	else
+		pxeRaidPartitionInputGeneric
+	fi
+}
+#======================================
+# pxePartitionInputFDASD
+#--------------------------------------
+function pxePartitionInputFDASD {
+	local field=0
+	local count=0
+	local IFS=","
+	for i in $PART;do
+		field=0
+		count=$((count + 1))
+		IFS=";" ; for n in $i;do
+		case $field in
+			0) partSize=$n   ; field=1 ;;
+			1) partID=$n     ; field=2 ;;
+			2) partMount=$n;
+		esac
+		done
+		partSize=$(pxeSizeToMB $partSize)
+		if [ "$partID" = '82' ] || [ "$partID" = 'S' ];then
+			partID=2
+		elif [ "$partID" = '83' ] || [ "$partID" = 'L' ];then
+			partID=1
+		elif [ "$partID" -eq '8e' ] || [ "$partID" = 'V' ];then
+			partID=4
+		else
+			partID=1
+		fi
+		echo -n "n . $partSize "
+		if [ $partID = "2" ] || [ $partID = "4" ];then
+			echo -n "t $count $partID "
+		fi
+	done
+	echo "w"
+}
+#======================================
+# pxeRaidPartitionInputFDASD
+#--------------------------------------
+function pxeRaidPartitionInputFDASD {
+	pxePartitionInputFDASD
+}
+#======================================
+# pxePartitionInputGeneric
+#--------------------------------------
+function pxePartitionInputGeneric {
 	local field=0
 	local count=0
 	local IFS=","
@@ -7366,9 +7421,9 @@
 	echo "w q"
 }
 #======================================
-# pxeRaidPartitionInput
+# pxeRaidPartitionInputGeneric
 #--------------------------------------
-function pxeRaidPartitionInput {
+function pxeRaidPartitionInputGeneric {
 	local field=0
 	local count=0
 	local IFS=","
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIMigrate.pm new/kiwi/modules/KIWIMigrate.pm
--- old/kiwi/modules/KIWIMigrate.pm	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/modules/KIWIMigrate.pm	2011-11-08 16:21:40.000000000 +0100
@@ -84,6 +84,7 @@
 		$kiwi -> failed ();
 		return undef;
 	}
+	$this->{gdata} = $main::global -> getGlobals();
 	my $product = $this -> getOperatingSystemVersion();
 	if (! defined $product) {
 		$kiwi -> failed ();
@@ -226,7 +227,6 @@
 	$this->{product} = $product;
 	$this->{mount}   = [];
 	$this->{autoyastCloneList} = \@autoyastCloneList;
-	$this->{gdata}   = $main::global -> getGlobals();
 	return $this;
 }
 
@@ -691,6 +691,7 @@
 		return undef;
 	}
 	foreach my $repo (@list) {
+		$repo =~ s/^\s+//g;
 		if ($repo =~ /^\d.*\|(.*)\|.*\|(.*)\|.*\|(.*)\|(.*)\|(.*)\|/) {
 			my $enabled = $2;
 			my $source  = $5;
@@ -811,7 +812,7 @@
 	#==========================================
 	# <description>
 	#------------------------------------------
-	print FD ''."\n";
 	print FD "\t".'<description type="system">'."\n";
 	print FD "\t\t".'<author>***AUTHOR***</author>'."\n";
@@ -824,8 +825,7 @@
 	print FD "\t".'<preferences>'."\n";
 	print FD "\t\t".''."\n";
-	print FD "\t\t\t".'<oemconfig>'."\n";
-	print FD "\t\t\t".'</oemconfig>'."\n";
+	print FD "\t\t\t".'<oemconfig/>'."\n";
 	print FD "\t\t".'</type>'."\n";
 	print FD "\t\t".'<version>1.1.1</version>'."\n";
 	print FD "\t\t".'<packagemanager>zypper</packagemanager>'."\n";
@@ -856,9 +856,10 @@
 	#==========================================
 	# <packages>
 	#------------------------------------------
-	print FD "\t".'<packages type="image">'."\n";
+	print FD "\t".'<packages type="bootstrap">'."\n";
 	if (defined $pats) {
 		foreach my $pattern (sort @{$pats}) {
+			$pattern =~ s/^pattern://;
 			print FD "\t\t".'<opensusePattern name="'.$pattern.'"/>'."\n";
 		}
 	}
@@ -868,15 +869,6 @@
 		}
 	}
 	print FD "\t".'</packages>'."\n";
-	#==========================================
-	# <packages type="bootstrap">
-	#------------------------------------------
-	print FD "\t".'<packages type="bootstrap">'."\n";
-	print FD "\t\t".'<package name="filesystem"/>'."\n";
-	print FD "\t\t".'<package name="glibc-locale"/>'."\n";
-	print FD "\t\t".'<package name="cracklib-dict-full"/>'."\n";
-	print FD "\t\t".'<package name="openssl-certs"/>'."\n";
-	print FD "\t".'</packages>'."\n";
 	print FD '</image>'."\n";
 	close FD;
 	return $this;
@@ -1119,15 +1111,15 @@
 					my $name = $1;
 					$name =~ s/^ +//g;
 					$name =~ s/ +$//g;
-					$pathash{"$name"} = "$name";
+					$pathash{"pattern:$name"} = "$name";
 				}
 			}
 			@patlist = keys %pathash;
 		}
 		$this->{patterns} = \@patlist;
 		my $psolve = new KIWISatSolver (
-			$kiwi,\@patlist,\@urllist,undef,undef,undef,
-			"silent","plusRecommended"
+			$kiwi,\@patlist,\@urllist,"solve-patterns",
+			undef,undef,undef,"plusRecommended"
 		);
 		my @result = ();
 		if (! defined $psolve) {
@@ -1180,8 +1172,8 @@
 			my $repo = $psolve -> getRepo();
 			my $pool = $psolve -> getPool();
 			my $xsolve = new KIWISatSolver (
-				$kiwi,\@result,\@urllist,"solve-packages",$repo,$pool,
-				"silent","plusRecommended"
+				$kiwi,\@result,\@urllist,"solve-packages",
+				$repo,$pool,undef,"plusRecommended"
 			);
 			if (! defined $xsolve) {
 				$kiwi -> error  ("Failed to solve packages");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIMigrate.txt new/kiwi/modules/KIWIMigrate.txt
--- old/kiwi/modules/KIWIMigrate.txt	2011-10-18 12:50:04.000000000 +0200
+++ new/kiwi/modules/KIWIMigrate.txt	2011-11-08 16:21:40.000000000 +0100
@@ -11,3 +11,5 @@
 openSUSE-11.1=suse-11.1
 openSUSE-11.2=suse-11.2
 openSUSE-11.3=suse-11.3
+openSUSE-11.4=suse-11.4
+openSUSE-12.1=suse-12.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc
--- old/kiwi/modules/KIWISchema.rnc	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/modules/KIWISchema.rnc	2011-11-08 16:21:40.000000000 +0100
@@ -1490,7 +1490,7 @@
 	k.type.format.attribute =
 		## Specifies the format of the virtual disk.
 		attribute format {
-			"ec2" | "ovf" | "qcow2" | "vmdk"
+			"ec2" | "ovf" | "qcow2" | "vmdk" | "vpc"
 		}
 	k.type.fsnocheck.attribute =
 		## Turn off periodic filesystem checks on ext2/3/4.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng
--- old/kiwi/modules/KIWISchema.rng	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/modules/KIWISchema.rng	2011-11-08 16:21:40.000000000 +0100
@@ -2013,6 +2013,7 @@
           <value>ovf</value>
           <value>qcow2</value>
           <value>vmdk</value>
+          <value>vpc</value>
         </choice>
       </attribute>
     </define>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc
--- old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc	2011-10-18 12:50:04.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc	2011-11-08 16:24:09.000000000 +0100
@@ -188,53 +188,7 @@
 #--------------------------------------
 swapSpace=`searchSwapSpace`
 if [ ! -z "$swapSpace" ];then
-	#======================================
-	# 11.1) use an existing swap partition
-	#--------------------------------------
 	Echo "Found swap space on: $swapSpace"
-else
-	#======================================
-	# 11.1) use a swap file on a free part.
-	#--------------------------------------
-	swapDevice=`searchDiskSpace`
-	if [ ! -z "$swapDevice" ];then
-		FSTYPE_SAVE=$FSTYPE
-		probeFileSystem $swapDevice
-		SWTYPE=$FSTYPE
-		FSTYPE=$FSTYPE_SAVE
-		if [ $SWTYPE = "unknown" ];then
-			Echo "Can't use unknown filesystem for swap file... skipped"
-		else
-			Echo "Setting up swap file on: $swapDevice -> $SWTYPE"
-			mRAM=`cat /proc/meminfo | grep MemTotal | cut -f2 -d:`
-			mRAM=`echo $mRAM | cut -f1 -d" "`
-			SWSIZE=`expr $mRAM / 1024`
-			SWSIZE=`expr $SWSIZE \* 2`
-			if [ $SWSIZE -lt 64 ];then
-				SWSIZE=64
-			fi
-			SWDIR=/liveswap
-			SWFILE=$SWDIR/kiwiswap
-			mkdir -p $SWDIR
-			if ! mount -t $SWTYPE $swapDevice $SWDIR;then
-				Echo "Failed to mount swap device on: $swapDevice"
-				unset swapDevice
-			fi
-			if [ ! -f $SWFILE ];then
-				dd if=/dev/zero of=$SWFILE bs=1M count=$SWSIZE >/dev/null
-				if [ ! $? = 0 ];then
-					Echo "Failed to create swap file on: $swapDevice"
-					unset swapDevice
-				fi
-				if ! mkswap $SWFILE >/dev/null;then
-					Echo "Failed to initialize swap file"
-					unset swapDevice
-				fi
-			fi
-			Echo "Created swap file: kiwiswap [ $SWSIZE MB ]"
-			umount $SWDIR
-		fi
-	fi
 fi
 
 #======================================
@@ -301,10 +255,6 @@
 updateRootDeviceFstab /config $imageDevice
 if [ ! -z "$swapSpace" ];then
 	updateSwapDeviceFstab /config $swapSpace
-elif [ ! -z "$swapDevice" ];then
-	mkdir -p /mnt/liveswap
-	echo "$swapDevice /liveswap $SWTYPE defaults 1 1"  >> /config/etc/fstab
-	echo "/liveswap/kiwiswap swap swap prio=42 0 0"    >> /config/etc/fstab
 fi
 
 #======================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-linuxrc new/kiwi/system/boot/ix86/isoboot/suse-linuxrc
--- old/kiwi/system/boot/ix86/isoboot/suse-linuxrc	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/suse-linuxrc	2011-11-08 16:24:09.000000000 +0100
@@ -189,53 +189,7 @@
 #--------------------------------------
 swapSpace=`searchSwapSpace`
 if [ ! -z "$swapSpace" ];then
-	#======================================
-	# 11.1) use an existing swap partition
-	#--------------------------------------
 	Echo "Found swap space on: $swapSpace"
-else
-	#======================================
-	# 11.1) use a swap file on a free part.
-	#--------------------------------------
-	swapDevice=`searchDiskSpace`
-	if [ ! -z "$swapDevice" ];then
-		FSTYPE_SAVE=$FSTYPE
-		probeFileSystem $swapDevice
-		SWTYPE=$FSTYPE
-		FSTYPE=$FSTYPE_SAVE
-		if [ $SWTYPE = "unknown" ];then
-			Echo "Can't use unknown filesystem for swap file... skipped"
-		else
-			Echo "Setting up swap file on: $swapDevice -> $SWTYPE"
-			mRAM=`cat /proc/meminfo | grep MemTotal | cut -f2 -d:`
-			mRAM=`echo $mRAM | cut -f1 -d" "`
-			SWSIZE=`expr $mRAM / 1024`
-			SWSIZE=`expr $SWSIZE \* 2`
-			if [ $SWSIZE -lt 64 ];then
-				SWSIZE=64
-			fi
-			SWDIR=/liveswap
-			SWFILE=$SWDIR/kiwiswap
-			mkdir -p $SWDIR
-			if ! mount -t $SWTYPE $swapDevice $SWDIR;then
-				Echo "Failed to mount swap device on: $swapDevice"
-				unset swapDevice
-			fi
-			if [ ! -f $SWFILE ];then
-				dd if=/dev/zero of=$SWFILE bs=1M count=$SWSIZE >/dev/null
-				if [ ! $? = 0 ];then
-					Echo "Failed to create swap file on: $swapDevice"
-					unset swapDevice
-				fi
-				if ! mkswap $SWFILE >/dev/null;then
-					Echo "Failed to initialize swap file"
-					unset swapDevice
-				fi
-			fi
-			Echo "Created swap file: kiwiswap [ $SWSIZE MB ]"
-			umount $SWDIR
-		fi
-	fi
 fi
 
 #======================================
@@ -302,10 +256,6 @@
 updateRootDeviceFstab /config $imageDevice
 if [ ! -z "$swapSpace" ];then
 	updateSwapDeviceFstab /config $swapSpace
-elif [ ! -z "$swapDevice" ];then
-	mkdir -p /mnt/liveswap
-	echo "$swapDevice /liveswap $SWTYPE defaults 1 1"  >> /config/etc/fstab
-	echo "/liveswap/kiwiswap swap swap prio=42 0 0"    >> /config/etc/fstab
 fi
 
 #======================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml new/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml	2011-11-08 16:21:40.000000000 +0100
@@ -240,7 +240,6 @@
 		<package name="diffutils"/>
 		<package name="expat"/>
 		<package name="fillup"/>
-		<package name="gawk"/>
 		<package name="gdbm"/>
 		<package name="glib2"/>
 		<package name="glibc-locale"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-11.4/config.xml	2011-11-08 16:21:40.000000000 +0100
@@ -244,7 +244,6 @@
 		<package name="diffutils"/>
 		<package name="expat"/>
 		<package name="fillup"/>
-		<package name="gawk"/>
 		<package name="gdbm"/>
 		<package name="glib2"/>
 		<package name="glibc-locale"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml new/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-12.1/config.xml	2011-11-08 16:21:40.000000000 +0100
@@ -245,7 +245,6 @@
 		<package name="diffutils"/>
 		<package name="expat"/>
 		<package name="fillup"/>
-		<package name="gawk"/>
 		<package name="gdbm"/>
 		<package name="glib2"/>
 		<package name="glibc-locale"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml	2011-11-08 16:21:40.000000000 +0100
@@ -111,7 +111,6 @@
 		<package name="perl-gettext"/>
 		<package name="perl-Bootloader"/>
 		<package name="pam-modules"/>
-		<package name="gawk"/>
 		<package name="gnome-filesystem"/>
 		<package name="openslp"/>
 		<package name="suse-build-key"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml	2011-11-08 16:21:40.000000000 +0100
@@ -230,7 +230,6 @@
 		<package name="diffutils"/>
 		<package name="expat"/>
 		<package name="fillup"/>
-		<package name="gawk"/>
 		<package name="gdbm"/>
 		<package name="glib2"/>
 		<package name="glibc-locale"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml	2011-11-08 16:21:40.000000000 +0100
@@ -113,7 +113,6 @@
 		<package name="perl-gettext"/>
 		<package name="perl-Bootloader"/>
 		<package name="pam-modules"/>
-		<package name="gawk"/>
 		<package name="gnome-filesystem"/>
 		<package name="openslp"/>
 		<package name="suse-build-key"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml	2011-11-08 16:21:40.000000000 +0100
@@ -231,7 +231,6 @@
 		<package name="diffutils"/>
 		<package name="expat"/>
 		<package name="fillup"/>
-		<package name="gawk"/>
 		<package name="gdbm"/>
 		<package name="glib2"/>
 		<package name="glibc-locale"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc new/kiwi/system/boot/ix86/netboot/suse-linuxrc
--- old/kiwi/system/boot/ix86/netboot/suse-linuxrc	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc	2011-11-08 16:21:40.000000000 +0100
@@ -93,7 +93,7 @@
 # 4) Include proc/cmdline information
 #--------------------------------------
 includeKernelParameters
-if [ ! -z $IMAGE ];then
+if [ ! -z "$IMAGE" ];then
 	# /.../
 	# if the image information is already in place at this stage
 	# it comes from the cmdline data which means we are not booting
@@ -344,8 +344,8 @@
 #======================================
 # 14) Create ptable on diskful system
 #--------------------------------------
+runHook prepartition
 if [ $LOCAL_BOOT = "no" ] && [ $systemIntegrity = "clean" ];then
-	runHook prepartition
 	#======================================
 	# Create partition table
 	#--------------------------------------
@@ -427,8 +427,8 @@
 			createFilesystem $imageBootDevice
 		fi
 	fi
-	runHook postpartition
 fi
+runHook postpartition
 
 #======================================
 # 15) Setup root device environment
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml	2011-10-28 13:59:34.000000000 +0200
+++ new/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml	2011-11-08 16:21:40.000000000 +0100
@@ -229,7 +229,6 @@
 		<package name="diffutils"/>
 		<package name="expat"/>
 		<package name="fillup"/>
-		<package name="gawk"/>
 		<package name="gdbm"/>
 		<package name="glib2"/>
 		<package name="glibc-locale"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-linuxrc new/kiwi/system/boot/ppc/netboot/suse-linuxrc
--- old/kiwi/system/boot/ppc/netboot/suse-linuxrc	2011-10-28 13:59:35.000000000 +0200
+++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc	2011-11-08 16:21:40.000000000 +0100
@@ -93,7 +93,7 @@
 # 4) Include proc/cmdline information
 #--------------------------------------
 includeKernelParameters
-if [ ! -z $IMAGE ];then
+if [ ! -z "$IMAGE" ];then
 	# /.../
 	# if the image information is already in place at this stage
 	# it comes from the cmdline data which means we are not booting
@@ -344,8 +344,8 @@
 #======================================
 # 14) Create ptable on diskful system
 #--------------------------------------
+runHook prepartition
 if [ $LOCAL_BOOT = "no" ] && [ $systemIntegrity = "clean" ];then
-	runHook prepartition
 	#======================================
 	# Create partition table
 	#--------------------------------------
@@ -427,8 +427,8 @@
 			createFilesystem $imageBootDevice
 		fi
 	fi
-	runHook postpartition
 fi
+runHook postpartition
 
 #======================================
 # 15) Setup root device environment
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml new/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml	2011-10-28 13:59:35.000000000 +0200
+++ new/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml	2011-11-08 16:21:40.000000000 +0100
@@ -119,7 +119,6 @@
 		<package name="diffutils"/>
 		<package name="expat"/>
 		<package name="fillup"/>
-		<package name="gawk"/>
 		<package name="gdbm"/>
 		<package name="glib2"/>
 		<package name="glibc-locale"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-linuxrc new/kiwi/system/boot/s390/netboot/suse-linuxrc
--- old/kiwi/system/boot/s390/netboot/suse-linuxrc	2011-10-28 13:59:35.000000000 +0200
+++ new/kiwi/system/boot/s390/netboot/suse-linuxrc	2011-11-08 16:21:40.000000000 +0100
@@ -60,6 +60,19 @@
 initialize
 
 #======================================
+# recreateVTOCTable
+#--------------------------------------
+function recreateVTOCTable {
+	# /.../
+	# re-create VTOC re-using existing partition sizes
+	# ----
+	Echo "Recreate VTOC table [ $imageDiskDevice ]"
+	createPartitionerInput u y w
+	callPartitioner $input
+	rm -f $input
+}
+
+#======================================
 # Beautify Startup
 #--------------------------------------
 echo "Loading KIWI PXE Boot-System..."
@@ -92,7 +105,7 @@
 # 4) Include proc/cmdline information
 #--------------------------------------
 includeKernelParametersLowerCase
-if [ ! -z $IMAGE ];then
+if [ ! -z "$IMAGE" ];then
 	# /.../
 	# if the image information is already in place at this stage
 	# it comes from the cmdline data which means we are not booting
@@ -266,6 +279,7 @@
 #======================================
 # 12) Check for diskful station
 #--------------------------------------
+searchBusIDBootDevice
 if [ $LOCAL_BOOT = "no" ];then
 	checkDevice=$DISK
 	if [ -z "$checkDevice" ];then
@@ -344,8 +358,8 @@
 #======================================
 # 14) Create ptable on diskful system
 #--------------------------------------
+runHook prepartition
 if [ $LOCAL_BOOT = "no" ] && [ $systemIntegrity = "clean" ];then
-	runHook prepartition
 	#======================================
 	# Create partition table
 	#--------------------------------------
@@ -355,6 +369,7 @@
 		# Standard table
 		#--------------------------------------
 		cleanPartitionTable
+		recreateVTOCTable
 		createPartitionerInput $(pxePartitionInput)
 		callPartitioner $input
 	else
@@ -394,6 +409,7 @@
 			imageDiskDevice=$raid_dev
 			rm -f $input
 			cleanPartitionTable
+			recreateVTOCTable
 			createPartitionerInput $(pxeRaidPartitionInput)
 			callPartitioner $input
 		done
@@ -427,8 +443,8 @@
 			createFilesystem $imageBootDevice
 		fi
 	fi
-	runHook postpartition
 fi
+runHook postpartition
 
 #======================================
 # 15) Setup root device environment
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-preinit new/kiwi/system/boot/s390/netboot/suse-preinit
--- old/kiwi/system/boot/s390/netboot/suse-preinit	2011-10-28 13:59:35.000000000 +0200
+++ new/kiwi/system/boot/s390/netboot/suse-preinit	2011-11-08 16:21:40.000000000 +0100
@@ -39,7 +39,25 @@
 udevSystemStart
 
 #======================================
-# 4) create initrd on diskful
+# 5) update mount table
+#--------------------------------------
+updateMTAB
+
+#======================================
+# 6) check preinit services
+#--------------------------------------
+if isVirtioDevice;then
+	runPreinitServices virtio
+fi
+if isDASDDevice;then
+	runPreinitServices dasd
+fi
+if isZFCPDevice;then
+	runPreinitServices zfcp
+fi
+
+#======================================
+# 7) create initrd on diskful
 #--------------------------------------
 if [ ! -z "$imageDiskDevice" ] && [ "$systemIntegrity" = "clean" ]; then
 	if [ -z "$UNIONFS_CONFIG" ] && [ -z "$COMBINED_IMAGE" ]; then
@@ -56,14 +74,14 @@
 fi
 
 #======================================
-# 5) Install boot loader on diskful
+# 8) Install boot loader on diskful
 #--------------------------------------
 if [ "$bootLoaderOK" = 1 ];then
 	installBootLoader
 fi
 
 #======================================
-# 6) create /etc/ImagePackages
+# 9) create /etc/ImagePackages
 #--------------------------------------
 if [ "$systemIntegrity" = "clean" ];then
 	if [ -x /bin/rpm ];then
@@ -73,7 +91,7 @@
 fi
 
 #======================================
-# 7) check for valid mount points
+# 10) check for valid mount points
 #--------------------------------------
 if [ ! -z "$imageDiskDevice" ] && [ "$systemIntegrity" = "clean" ];then
 	IFS=":" ; for i in $PART_MOUNT;do
@@ -84,7 +102,7 @@
 fi
 
 #======================================
-# 8) Update /etc/ImageVersion files
+# 11) Update /etc/ImageVersion files
 #--------------------------------------
 if [ ! -z "$imageDiskDevice" ] && [ "$systemIntegrity" = "clean" ];then
 	count=0
@@ -108,31 +126,33 @@
 fi
 
 #======================================
-# 9) setup console
+# 12) setup console
 #--------------------------------------
 if [ "$systemIntegrity" = "clean" ];then
 	setupConsole
 fi
 
 #======================================
-# 10) setup static network
+# 13) setup static network
 #--------------------------------------
 if [ "$systemIntegrity" = "clean" ];then
+	setupNetworkInterfaceS390
+	udevPending
 	setupNetworkStatic 0
 fi
 
 #======================================
-# 11) kernelCheck
+# 14) kernelCheck
 #--------------------------------------
 kernelCheck
 
 #======================================
-# 12) create origin snapshot if possible
+# 15) create origin snapshot if possible
 #--------------------------------------
 createOriginSnapshot
 
 #======================================
-# 13) kill udev
+# 16) kill udev
 #--------------------------------------
 udevSystemStop
 umountSystemFilesystems
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/01-console.sh new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/01-console.sh
--- old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/01-console.sh	2011-10-18 12:50:04.000000000 +0200
+++ new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/01-console.sh	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-#!/bin/bash
-# hvc console setup for KVM guest
-# ----
-cp /etc/init.d/kiwi/virtio/inittab   /etc
-cp /etc/init.d/kiwi/virtio/securetty /etc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/inittab new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/inittab
--- old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/inittab	2011-10-18 12:50:04.000000000 +0200
+++ new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/inittab	1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-#
-# /etc/inittab
-#
-# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany.  All rights reserved.
-#
-# Author: Florian La Roche, 1996
-# Please send feedback to http://www.suse.de/feedback
-#
-# This is the main configuration file of /sbin/init, which
-# is executed by the kernel on startup. It describes what
-# scripts are used for the different run-levels.
-#
-# All scripts for runlevel changes are in /etc/init.d/.
-#
-# This file may be modified by SuSEconfig unless CHECK_INITTAB
-# in /etc/sysconfig/suseconfig is set to "no"
-#
-
-# The default runlevel is defined here
-id:3:initdefault:
-
-# First script to be executed, if not booting in emergency (-b) mode
-si::bootwait:/etc/init.d/boot
-
-# /etc/init.d/rc takes care of runlevel handling
-#
-# runlevel 0  is  System halt   (Do not use this for initdefault!)
-# runlevel 1  is  Single user mode
-# runlevel 2  is  Local multiuser without remote network (e.g. NFS)
-# runlevel 3  is  Full multiuser with network
-# runlevel 4  is  Not used
-# runlevel 5  is  Full multiuser with network and xdm
-# runlevel 6  is  System reboot (Do not use this for initdefault!)
-#
-l0:0:wait:/etc/init.d/rc 0
-l1:1:wait:/etc/init.d/rc 1
-l2:2:wait:/etc/init.d/rc 2
-l3:3:wait:/etc/init.d/rc 3
-#l4:4:wait:/etc/init.d/rc 4
-l5:5:wait:/etc/init.d/rc 5
-l6:6:wait:/etc/init.d/rc 6
-
-# what to do in single-user mode
-ls:S:wait:/etc/init.d/rc S
-~~:S:respawn:/sbin/sulogin
-
-# Default HMC/3215/3270 console:
-#1:2345:respawn:/sbin/mingetty --noclear /dev/ttyS0 dumb
-# VT220(Linux) console:
-#2:2345:respawn:/sbin/mingetty --noclear /dev/ttyS1 xterm
-# additional 3270 terminals:
-#3:2345:respawn:/sbin/mingetty --noclear /dev/3270/ttycons dumb
-# KVM hypervisor console:
-1:2345:respawn:/sbin/mingetty --noclear /dev/hvc0 linux
-
-# what to do when CTRL-ALT-DEL is pressed
-ca::ctrlaltdel:/sbin/shutdown -r -t 4 now
-
-# not used for now:
-pf::powerwait:/etc/init.d/powerfail start
-pn::powerfailnow:/etc/init.d/powerfail now
-#pn::powerfail:/etc/init.d/powerfail now
-po::powerokwait:/etc/init.d/powerfail stop
-sh:12345:powerfail:/sbin/shutdown -h now THE POWER IS FAILING
-
-# end of /etc/inittab
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/securetty new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/securetty
--- old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/securetty	2011-10-18 12:50:04.000000000 +0200
+++ new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/virtio/securetty	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-# 
-# This file contains the device names of tty lines (one per line,
-# without leading /dev/) on which root is allowed to login.
-#
-tty1
-tty2
-tty3
-tty4
-tty5
-tty6
-ttyS0
-ttyS1
-hvc0

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

    

commit kiwi for openSUSE:12.1

root＠hilbert.suse.de