Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Thu Apr 21 14:23:35 CEST 2011.
--------
--- kiwi/kiwi.changes 2011-04-15 14:28:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-04-21 14:01:56.000000000 +0200
@@ -1,0 +2,87 @@
+Thu Apr 21 13:55:55 CEST 2011 - ms@suse.de
+
+- v4.87 released
+
+-------------------------------------------------------------------
+Thu Apr 21 11:32:48 CEST 2011 - ms@suse.de
+
+- fixed initial variable setup for haveDASD|ZFCP
+
+-------------------------------------------------------------------
+Thu Apr 21 11:09:59 CEST 2011 - ms@suse.de
+
+- changed searchBusIDBootDevice() for the s390 architecture.
+ All required information is now obtained from /sys/firmware/ipl
+ According to this no additional kernel parameters are
+ required to set the boot device online (bnc #689004)
+
+-------------------------------------------------------------------
+Thu Apr 21 09:05:49 CEST 2011 - ms@suse.de
+
+- added alternative location for kiwi hooks scripts which
+ is FHS compliant: /lib/kiwi/hooks/ (bnc #688792)
+
+-------------------------------------------------------------------
+Wed Apr 20 16:59:23 CEST 2011 - ms@suse.de
+
+- added URL mapping table for the opensuse:// url type. When
+ resolving this the regular expression based mapping table is
+ used to create a valid location from the specified URI data.
+ It's possible to extend the existing KIWIURL.txt table
+ according to the needs of the user or service.
+
+-------------------------------------------------------------------
+Wed Apr 20 10:45:52 CEST 2011 - ms@suse.de
+
+- changed xsl 51 to 52 conversion. The obsolete usb image type
+ is removed from the XML input. this image type can be either
+ replaced by an iso hybrid type or by an oem type. As there is
+ a choice for the user the stylesheet will not make a decision
+ here.
+
+-------------------------------------------------------------------
+Wed Apr 20 10:15:28 CEST 2011 - ms@suse.de
+
+- netboot: added preLoadConfiguration hook:
+ preLoadConfiguration: is called before the client.<MAC> is
+ loaded by kiwi and thus can be used to inject alternative code
+ for loading the client configuration.
+
+- netboot: added postLoadConfiguration hook:
+ postLoadConfiguration: is called after the client configuration
+ has been loaded and imported and can be used for any action
+ after the client configuration has exported its variables into
+ the boot environment
+
+- netboot: renamed the default register file which is put on
+ the pxe boot server if there is client configuration found.
+ kiwi now put a file called: upload/client.$DHCPCHADDR
+ which doesn't conflict with the files SLEPOS uses for
+ registration
+
+- netboot: removed SLEPOS related code, posbios calls and
+ the evaluation of the WORKSTATION_LDAP_IP variable. All
+ this will be part of product specific hook scripts
+
+-------------------------------------------------------------------
+Wed Apr 20 10:14:28 CEST 2011 - ms@suse.de
+
+- allow parameters to be passed to hook scripts
+
+-------------------------------------------------------------------
+Tue Apr 19 12:55:56 CEST 2011 - ms@suse.de
+
+- added setupBootLoaderTheme() function which is called
+ after the bootloader configuration has been written. The
+ function adapts/sets the THEME variable in the
+ /etc/sysconfig/bootsplash file according to the boot
+ theme set in the kiwi XML configuration
+
+-------------------------------------------------------------------
+Mon Apr 18 11:08:54 CEST 2011 - ms@suse.de
+
+- fixed suseStripFirmware to match in subdirectories below
+ /lib/firmware/ too. firmware installed by the kernel packages
+ for example were removed
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.VtyvQa/_old 2011-04-21 14:23:01.000000000 +0200
+++ /var/tmp/diff_new_pack.VtyvQa/_new 2011-04-21 14:23:01.000000000 +0200
@@ -65,7 +65,7 @@
%endif
%endif
Summary: OpenSuSE - KIWI Image System
-Version: 4.86
+Version: 4.87
Release: 1
Group: System/Management
License: GPLv2
++++++ kiwi-docu.tar.bz2 ++++++
kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2011-04-15 14:23:59.000000000 +0200
+++ new/kiwi/.revision 2011-04-21 13:57:55.000000000 +0200
@@ -1 +1 @@
-80f0d67a9a84dc59f34307e2f2879b1f6618d102
+dec521fd69f73299badd58ccf92098e59cfb1f71
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2011-04-15 14:23:59.000000000 +0200
+++ new/kiwi/kiwi.pl 2011-04-21 13:57:55.000000000 +0200
@@ -50,11 +50,9 @@
#============================================
# Globals (Version)
#--------------------------------------------
-our $Version = "4.86";
+our $Version = "4.87";
our $Publisher = "SUSE LINUX Products GmbH";
our $Preparer = "KIWI - http://kiwi.berlios.de";
-our $openSUSE = "http://download.opensuse.org";
-our @openSUSE = ("distribution","repositories");
our $ConfigFile = "$ENV{'HOME'}/.kiwirc";
our $ConfigName = "config.xml";
our $Partitioner = "parted";
@@ -105,6 +103,7 @@
our $KRegion = $BasePath."/modules/KIWIEC2Region.txt";
our $KMigraCSS= $BasePath."/modules/KIWIMigrate.tgz";
our $KSplit = $BasePath."/modules/KIWISplit.txt";
+our $repoURI = $BasePath."/modules/KIWIURL.txt";
our $Revision = $BasePath."/.revision";
our $TestBase = $BasePath."/tests";
our $SchemaCVT= $BasePath."/xsl/master.xsl";
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-04-14 17:14:27.000000000 +0200
+++ new/kiwi/modules/KIWIBoot.pm 2011-04-21 12:02:24.000000000 +0200
@@ -3441,21 +3441,6 @@
print FD "$this->{mbrid}";
close FD;
$kiwi -> done();
- my %ccwid;
- #==========================================
- # Create disk Bus-ID for online call
- #------------------------------------------
- if ($main::targetDevice) {
- $kiwi -> info ("Saving disk Bus-ID...");
- %ccwid = $this -> __getCCWID ($main::targetDevice);
- if ((! $ccwid{busid}) && (! $ccwid{ccwid})) {
- $kiwi -> failed ();
- $kiwi -> error ("Can't find Bus-ID for $main::targetDevice");
- $kiwi -> failed ();
- return undef;
- }
- $kiwi -> done();
- }
#==========================================
# Create zipl.conf
#------------------------------------------
@@ -3528,14 +3513,7 @@
print FD "\t"."ramdisk = boot/initrd,0x2000000"."\n";
}
print FD "\t"."parameters = \"loader=$bloader";
- if ($ccwid{busid}) {
- print FD " busid=$ccwid{busid} $cmdline\""."\n";
- } elsif ($ccwid{ccwid}) {
- print FD " ccwid=$ccwid{ccwid} wwpn=$ccwid{wwpn} lun=$ccwid{lun}";
- print FD " $cmdline\""."\n";
- } else {
- print FD " $cmdline\""."\n";
- }
+ print FD " $cmdline\""."\n";
#==========================================
# Failsafe boot
#------------------------------------------
@@ -3555,14 +3533,7 @@
print FD "\t"."ramdisk = boot/initrd,0x2000000"."\n";
}
print FD "\t"."parameters = \"x11failsafe loader=$bloader";
- if ($ccwid{busid}) {
- print FD " busid=$ccwid{busid} $cmdline\""."\n";
- } elsif ($ccwid{ccwid}) {
- print FD " ccwid=$ccwid{ccwid} wwpn=$ccwid{wwpn} lun=$ccwid{lun}";
- print FD " $cmdline\""."\n";
- } else {
- print FD " $cmdline\""."\n";
- }
+ print FD " $cmdline\""."\n";
close FD;
$kiwi -> done();
}
@@ -5183,57 +5154,4 @@
return $this;
}
-#==========================================
-# __getCCWID
-#------------------------------------------
-sub __getCCWID {
- # ...
- # find the ccwid and wwpn + lun if a zfcp device
- # is specified. The function will turn the device node
- # name into a by-path name if necessary and matches
- # the values from the by-path device naming convention
- # for s390 DASD and ZFCP devices. The function will
- # return an empty hash if no such device exists
- # ----
- my $this = shift;
- my $kiwi = $this->{kiwi};
- my $device = shift;
- my $bypath = '\/dev\/disk\/by-path';
- my %result = ();
- #==========================================
- # check if device exists
- #------------------------------------------
- if (! -e $device) {
- $kiwi -> loginfo ("getCCWID: Device $device doesn't exist\n");
- return %result;
- }
- #==========================================
- # turn device name into by-path name
- #------------------------------------------
- if ($device !~ /$bypath\/.*/) {
- my @paths = glob ("/dev/disk/by-path/*");
- foreach my $path (@paths) {
- my $ndev = readlink ($path);
- $ndev = "/dev/".basename $ndev;
- if ($ndev eq $device) {
- $device = $path; last;
- }
- }
- }
- #==========================================
- # match values
- #------------------------------------------
- if ($device =~ /$bypath\/ccw-([^-]+)$/) {
- $result{busid}=$1;
- } elsif ($device =~ /$bypath\/ccw-(.*)-zfcp-(.*):([^-]+)$/) {
- $result{ccwid} = $1;
- $result{wwpn} = $2;
- $result{lun} = $3;
- } else {
- $kiwi -> loginfo ("Invalid disk device specified: $device\n");
- return %result;
- }
- return %result;
-}
-
1;
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-04-08 14:27:57.000000000 +0200
+++ new/kiwi/modules/KIWIConfig.sh 2011-04-21 12:02:24.000000000 +0200
@@ -1333,11 +1333,17 @@
for i in $(find $base -name "*.ko" | xargs modinfo | grep ^firmware);do
IFS=$ifs
name=$(echo $(echo $i | cut -f2 -d:))
- if [ -e /lib/firmware/$name ];then
- bmdir=$(dirname $name)
- mkdir -p /lib/firmware-required/$bmdir
- mv /lib/firmware/$name /lib/firmware-required/$bmdir
+ if [ -z "$name" ];then
+ continue
fi
+ for match in /lib/firmware/$name /lib/firmware/*/$name;do
+ if [ -e $match ];then
+ match=$(echo $match | sed -e 's@\/lib\/firmware\/@@')
+ bmdir=$(dirname $match)
+ mkdir -p /lib/firmware-required/$bmdir
+ mv /lib/firmware/$match /lib/firmware-required/$bmdir
+ fi
+ done
done
rm -rf /lib/firmware
mv /lib/firmware-required /lib/firmware
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-04-14 17:14:27.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2011-04-21 12:02:25.000000000 +0200
@@ -32,6 +32,8 @@
#======================================
# Exports (General)
#--------------------------------------
+test -z "$haveDASD" && export haveDASD=0
+test -z "$haveZFCP" && export haveZFCP=0
test -z "$ELOG_CONSOLE" && export ELOG_CONSOLE=/dev/tty3
test -z "$ELOG_BOOTSHELL" && export ELOG_BOOTSHELL=/dev/tty2
test -z "$ELOG_EXCEPTION" && export ELOG_EXCEPTION=/dev/tty1
@@ -977,6 +979,44 @@
"*** boot loader setup for $arch-$loader not implemented ***" \
"reboot"
esac
+ setupBootLoaderTheme "/config"
+}
+#======================================
+# setupBootLoaderTheme
+#--------------------------------------
+function setupBootLoaderTheme {
+ local destprefix=$1
+ local srcprefix=$2
+ if [ -z "$srcprefix" ];then
+ srcprefix=/mnt
+ fi
+ #======================================
+ # no boot theme set, return
+ #--------------------------------------
+ if [ -z "$kiwi_boottheme" ];then
+ return
+ fi
+ #======================================
+ # prepare paths
+ #--------------------------------------
+ local sysimg_bootsplash=$srcprefix/etc/sysconfig/bootsplash
+ local sysbootsplash=$destprefix/etc/sysconfig/bootsplash
+ mkdir -p $destprefix/etc/sysconfig
+ touch $sysbootsplash
+ #======================================
+ # check for bootsplash config in sysimg
+ #--------------------------------------
+ if [ -f $sysimg_bootsplash ];then
+ cp $sysimg_bootsplash $sysbootsplash
+ fi
+ #======================================
+ # change/create bootsplash config
+ #--------------------------------------
+ if cat $sysbootsplash | grep -q -E "^THEME"; then
+ sed -i "s/^THEME=.*/THEME=\"$kiwi_boottheme\"/" $sysbootsplash
+ else
+ echo "THEME=\"$kiwi_boottheme\"" >> $sysbootsplash
+ fi
}
#======================================
# setupBootLoaderRecovery
@@ -3162,21 +3202,33 @@
# device is set online and the biosBootDevice variable
# is set to this device for further processing
# ----
- local haveDASD=0
- local haveZFCP=0
local deviceID=0
local dpath=/dev/disk/by-path
+ local ipl_type=$(cat /sys/firmware/ipl/ipl_type)
+ local wwpn
+ local slun
#======================================
- # distinguish between dasd and zfcp
+ # determine device type: dasd or zfcp
#--------------------------------------
- if [ ! -z "$ccwid" ] ;then
- deviceID=$ccwid
+ if [ -z "$ipl_type" ];then
+ systemException \
+ "Can't find IPL type" \
+ "reboot"
+ fi
+ if [ "$ipl_type" = "fcp" ];then
haveZFCP=1
- elif [ ! -z "$busid" ];then
- deviceID=$busid
+ elif [ "$ipl_type" = "ccw" ];then
haveDASD=1
+ else
+ systemException \
+ "Unknown IPL type: $ipl_type" \
+ "reboot"
fi
#======================================
+ # store device bus / host id
+ #--------------------------------------
+ deviceID=$(cat /sys/firmware/ipl/device)
+ #======================================
# check if we can find the device
#--------------------------------------
if [ ! -e /sys/bus/ccw/devices/$deviceID ];then
@@ -3195,9 +3247,11 @@
# ZFCP
#--------------------------------------
if [ $haveZFCP -eq 1 ];then
+ wwpn=$(cat /sys/firmware/ipl/wwpn)
+ slun=$(cat /sys/firmware/ipl/lun)
zfcp_host_configure $deviceID 1
- zfcp_disk_configure $deviceID $wwpn $lun 1
- biosBootDevice="$dpath/ccw-$deviceID-zfcp-$wwpn:$lun"
+ zfcp_disk_configure $deviceID $wwpn $slun 1
+ biosBootDevice="$dpath/ccw-$deviceID-zfcp-$wwpn:$slun"
fi
#======================================
# setup boot device variable
@@ -4681,8 +4735,11 @@
#--------------------------------------
function runHook {
HOOK="/kiwi-hooks/$1.sh"
+ if [ ! -e $HOOK ];then
+ HOOK="/lib/kiwi/hooks/$1.sh"
+ fi
if [ -e $HOOK ]; then
- . $HOOK
+ . $HOOK $@
fi
}
#======================================
@@ -6554,24 +6611,14 @@
function pxeSetupSystemHWTypeFile {
# /.../
# collects information about the alias name the
- # architecture the BIOS version and more and stores
- # that into a file suffixed by the hardware address of the
- # network card. Obtaining the BIOS information requires
- # the posbios tool to be installed in the initrd
+ # architecture and more and stores that into a
+ # file suffixed by the hardware address of the
+ # network card.
# ----
echo "NCNAME=$SYSALIAS" >> hwtype.$DHCPCHADDR
echo "CRNAME=$SYSALIAS" >> hwtype.$DHCPCHADDR
echo "IPADDR=$IPADDR" >> hwtype.$DHCPCHADDR
echo "ARCHITECTURE=$ARCH" >> hwtype.$DHCPCHADDR
- #========================================
- # Try to get BIOS data if tools are there
- #----------------------------------------
- if [ -f /sbin/posbios ];then
- HWBIOS=`/sbin/posbios -b`
- echo "HWBIOS=$HWBIOS" >> hwtype.$DHCPCHADDR
- HWTYPE=`/sbin/posbios -ms`
- echo "HWTYPE=$HWTYPE" >> hwtype.$DHCPCHADDR
- fi
}
#======================================
# pxeSizeToMB
@@ -6963,7 +7010,7 @@
# isVirtioDevice
#--------------------------------------
function isVirtioDevice {
- if echo $imageDiskDevice | grep -q vda;then
+ if [ $haveDASD -eq 0 ] && [ $haveZFCP -eq 0 ];then
return 0
fi
return 1
@@ -6972,7 +7019,16 @@
# isDASDDevice
#--------------------------------------
function isDASDDevice {
- if echo $imageDiskDevice | grep -q dasd;then
+ if [ $haveDASD -eq 1 ];then
+ return 0
+ fi
+ return 1
+}
+#======================================
+# isZFCPDevice
+#--------------------------------------
+function isZFCPDevice {
+ if [ $haveZFCP -eq 1 ];then
return 0
fi
return 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIURL.pm new/kiwi/modules/KIWIURL.pm
--- old/kiwi/modules/KIWIURL.pm 2011-04-01 14:35:59.000000000 +0200
+++ new/kiwi/modules/KIWIURL.pm 2011-04-21 12:02:25.000000000 +0200
@@ -523,12 +523,12 @@
my $this = shift;
my $module = shift;
my $quiet = shift;
- my $browser = LWP::UserAgent->new;
- my $location = $main::openSUSE;
- my @dists = qw (standard);
- my @urllist = ();
my $kiwi = $this->{kiwi};
+ my $browser = LWP::UserAgent->new;
+ my $uriTable = $main::repoURI;
my $origurl = $module;
+ my %matches = ();
+ my $FD;
#==========================================
# allow proxy server from environment
#------------------------------------------
@@ -546,23 +546,29 @@
return undef;
}
#==========================================
- # Create urllist for later testing
+ # Create URL list from URI table
#------------------------------------------
- foreach my $dist (@dists) {
- foreach my $subdir (@main::openSUSE) {
- my $url1 = $location."/".$subdir."/".$module."/";
- push @urllist,$url1;
- if ($url1 !~ /\/$dist/) {
- my $url2 = $location."/".$subdir."/".$module."/".$dist."/";
- push @urllist,$url2;
- }
- }
+ if (! open $FD, $uriTable) {
+ return undef;
}
+ while (my $match =<$FD>) {
+ chomp $match;
+ my @list = split (/\|/,$match);
+ my $repo = $module;
+ my $match= '$repo =~ '.$list[1];
+ eval $match;
+ $matches{$repo} = $list[0];
+ }
+ close $FD;
#==========================================
- # Check url entries in urllist
+ # Check URL entries
#------------------------------------------
my @responses = ();
- foreach my $url (@urllist) {
+ foreach my $url (keys %matches) {
+ my $type = $matches{$url};
+ if ($type ne "opensuse") {
+ next;
+ }
my $response = $this -> urlResponse ( $browser,$url );
if (! $response) {
next;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIURL.txt new/kiwi/modules/KIWIURL.txt
--- old/kiwi/modules/KIWIURL.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/modules/KIWIURL.txt 2011-04-21 12:02:25.000000000 +0200
@@ -0,0 +1,5 @@
+opensuse|s/^/http:\/\/download.opensuse.org\//
+opensuse|s/^/http:\/\/download.opensuse.org\/repositories\//
+opensuse|s/^/http:\/\/download.opensuse.org\/distribution\//
+opensuse|s/build.opensuse.org/http:\/\/download.opensuse.org\/distribution/
+opensuse|s/build.opensuse.org/http:\/\/download.opensuse.org\/repositories/
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-04-13 18:18:10.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-04-21 12:02:25.000000000 +0200
@@ -145,11 +145,17 @@
if [ ! -z "$NBDROOT" ];then
KLIST[0]="NBDROOT=$NBDROOT";
fi
+ Echo "Checking for config file..."
#======================================
- # Connection/access check for SERVER
+ # hook: preLoadConfiguration
#--------------------------------------
- Echo "Checking for config file: config.$DHCPCHADDR"
- fetchFile KIWI/config.$DHCPCHADDR $CONFIG
+ runHook preLoadConfiguration
+ #======================================
+ # Load config.<MAC>
+ #--------------------------------------
+ if [ ! -s $CONFIG ] ; then
+ fetchFile KIWI/config.$DHCPCHADDR $CONFIG
+ fi
#======================================
# Check alternative config names
#--------------------------------------
@@ -174,17 +180,6 @@
searchHardwareMapConfig
IMPORTED=1
fi
- #========================================
- # Compare current IP and IP from config
- #----------------------------------------
- NEWIP=0
- if [ ! -z "$WORKSTATION_LDAP_IP" ]; then
- WSNR=`echo $WORKSTATION_LDAP_IP | sed -r -e 's/(^|\.)0*/\1/g'`
- IPNR=`echo $IPADDR | sed -r -e 's/(^|\.)0*/\1/g'`
- if [ "$WSNR" != "$IPNR" ];then
- NEWIP=1
- fi
- fi
#======================================
# No config found register new client
#--------------------------------------
@@ -199,8 +194,7 @@
#======================================
# Put files on the boot server
#--------------------------------------
- putFile hwtype.$DHCPCHADDR upload/hwtype.$DHCPCHADDR
- putFile hwinfo.$DHCPCHADDR upload/hwinfo.$DHCPCHADDR
+ putFile hwtype.$DHCPCHADDR upload/client.$DHCPCHADDR
echo
Echo "Registered as: $DHCPCHADDR"
Echo "Waiting for configuration..."
@@ -227,17 +221,6 @@
done
fi
#======================================
- # Config found but DHCP IP setup change
- #--------------------------------------
- if [ $NEWIP -eq 1 ];then
- Echo "Outdated IP address, notify new client setup..."
- pxeSetupSystemAliasName
- pxeSetupSystemHWTypeFile
- putFile hwtype.$DHCPCHADDR upload/hwtype.$DHCPCHADDR
- echo
- Echo "Notified: $DHCPCHADDR"
- fi
- #======================================
# import latest configuration
#--------------------------------------
if [ $IMPORTED -eq 0 ];then
@@ -256,6 +239,10 @@
eval export \"$i\"
done
fi
+ #======================================
+ # hook: postLoadConfiguration
+ #--------------------------------------
+ runHook postLoadConfiguration
fi
#======================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-preinit new/kiwi/system/boot/s390/oemboot/suse-preinit
--- old/kiwi/system/boot/s390/oemboot/suse-preinit 2011-03-11 15:36:06.000000000 +0100
+++ new/kiwi/system/boot/s390/oemboot/suse-preinit 2011-04-21 12:02:25.000000000 +0200
@@ -57,6 +57,9 @@
if isDASDDevice;then
runPreinitServices dasd
fi
+if isZFCPDevice;then
+ runPreinitServices zfcp
+fi
#======================================
# 7) create initrd on diskful
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-preinit new/kiwi/system/boot/s390/vmxboot/suse-preinit
--- old/kiwi/system/boot/s390/vmxboot/suse-preinit 2011-04-11 17:15:55.000000000 +0200
+++ new/kiwi/system/boot/s390/vmxboot/suse-preinit 2011-04-21 12:02:25.000000000 +0200
@@ -57,6 +57,9 @@
if isDASDDevice;then
runPreinitServices dasd
fi
+if isZFCPDevice;then
+ runPreinitServices zfcp
+fi
#======================================
# 7) create /etc/ImagePackages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/zfcp/01-network.sh new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/zfcp/01-network.sh
--- old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/zfcp/01-network.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/zfcp/01-network.sh 2011-04-21 12:02:25.000000000 +0200
@@ -0,0 +1,24 @@
+#!/bin/bash
+# s390 network hardware setup
+# ----
+#======================================
+# Functions...
+#--------------------------------------
+. /include
+
+qeth_port=VSWL2
+qeth_read=0.0.0800
+qeth_write=0.0.0801
+qeth_ctrl=0.0.0802
+qeth_up=1
+
+#======================================
+# Include kernel parameters
+#--------------------------------------
+includeKernelParameters
+
+#======================================
+# Bring the device online
+#--------------------------------------
+qeth_configure -p $qeth_port -l $qeth_read $qeth_write $qeth_ctrl $qeth_up
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert51to52.xsl new/kiwi/xsl/convert51to52.xsl
--- old/kiwi/xsl/convert51to52.xsl 2010-12-03 16:08:52.000000000 +0100
+++ new/kiwi/xsl/convert51to52.xsl 2011-04-21 12:02:25.000000000 +0200
@@ -25,4 +25,16 @@
</image>
+<!-- remove obsolete usb image type -->
+