Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2012-04-11 11:00:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
and /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-03-26
11:02:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-04-11
11:00:07.000000000 +0200
@@ -1,0 +2,103 @@
+Wed Apr 4 14:46:33 CEST 2012 - m...@suse.de
+
+- v5.02.22 released
+
+-------------------------------------------------------------------
+Wed Apr 4 14:34:33 CEST 2012 - m...@suse.de
+
+- fixed missing filesystem resize operation for LVM based images.
+ If oem-systemsize and a freespace=all volume is setup kiwi
+ resized only the freespace=all volume and missed to resize the
+ root volume
+
+-------------------------------------------------------------------
+Tue Apr 3 12:10:13 CEST 2012 - m...@suse.de
+
+- fixed XSL stylesheet conversion: convert49to50.xsl
+ the apply templates recursion is broken by using another mode
+ so the fix is to stay in the same mode and select the value by
+ a modified xpath expression
+
+-------------------------------------------------------------------
+Mon Apr 2 16:48:01 CEST 2012 - m...@suse.de
+
+- fixed misleading error message when kiwi can't find the
+ image file on the pxe download server (bnc #754275)
+
+-------------------------------------------------------------------
+Mon Apr 2 12:09:42 CEST 2012 - m...@suse.de
+
+- fixed oem installation with luks encrypted root filesystem
+ during the repartitioning the luks setup has to close down
+ otherwise the partition table is busy (bnc #754978)
+
+-------------------------------------------------------------------
+Mon Apr 2 10:22:51 CEST 2012 - m...@suse.de
+
+- fixed test -z expression
+
+-------------------------------------------------------------------
+Mon Apr 2 10:14:14 CEST 2012 - m...@suse.de
+
+- fixed creation of sat job list, eliminate duplicate jobs
+
+-------------------------------------------------------------------
+Mon Apr 2 10:13:33 CEST 2012 - m...@suse.de
+
+- make sure solver failed packages/patterns are evaluated in info module
+
+-------------------------------------------------------------------
+Sat Mar 31 21:40:18 CEST 2012 - m...@suse.de
+
+- make sure libkmod stays in the initrd
+
+-------------------------------------------------------------------
+Sat Mar 31 21:24:37 CEST 2012 - m...@suse.de
+
+- make sure solver problems are evaluated in info module
+
+-------------------------------------------------------------------
+Fri Mar 30 15:37:31 CEST 2012 - m...@suse.de
+
+- v5.02.21 released
+
+-------------------------------------------------------------------
+Fri Mar 30 14:45:46 CEST 2012 - m...@suse.de
+
+- fixed incorrect fstab entry created for read-only systems
+
+-------------------------------------------------------------------
+Fri Mar 30 14:41:08 CEST 2012 - m...@suse.de
+
+- fixed identifyDevice() to calculate the correct index for
+ accessing an entry in the deviceArray list
+
+-------------------------------------------------------------------
+Fri Mar 30 14:00:26 CEST 2012 - m...@suse.de
+
+- moved from md5_base64 to md5_hex for the creation of random
+ repo alias names. md5_base64 could create names with a '/'
+ and that causes trouble when checking for the existence of
+ the repo file. In order to avoid to implement the same
+ escape code as used by zypper in kiwi for such alias names,
+ I'd better moved the code to create hex number based alias
+ names
+
+-------------------------------------------------------------------
+Thu Mar 29 11:11:19 CEST 2012 - m...@suse.de
+
+- make sure ZYPP_LOCKFILE_ROOT is set appropriately when zypper
+ is used with --root option (bnc #753818)
+
+-------------------------------------------------------------------
+Wed Mar 28 16:15:34 CEST 2012 - m...@suse.de
+
+- fixed updateOtherDeviceFstab() to correctly create missing
+ mount points inside the root file system (bnc #754344)
+
+-------------------------------------------------------------------
+Wed Mar 28 13:51:56 CEST 2012 - m...@suse.de
+
+- make sure volume group name doesn't contain white spaces
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.ZlaXYe/_old 2012-04-11 11:00:10.000000000 +0200
+++ /var/tmp/diff_new_pack.ZlaXYe/_new 2012-04-11 11:00:10.000000000 +0200
@@ -22,7 +22,7 @@
Summary: OpenSuSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.02.20
+Version: 5.02.22
Release: 0
# requirements to build packages
BuildRequires: gcc-c++
++++++ kiwi-docu.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2
/work/SRC/openSUSE:Factory/.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 2012-03-16 14:27:44.000000000 +0100
+++ new/kiwi/.revision 2012-04-04 14:47:00.000000000 +0200
@@ -1 +1 @@
-24ec0eed210a250738d298e186cc77ee07ba577e
+8d9922ac6cea5a82fe6899b52d0e6efe10e7e1f6
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 2012-03-23 14:41:02.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm 2012-04-04 14:47:00.000000000 +0200
@@ -4685,6 +4685,7 @@
}
chomp $vgname;
$vgname =~ s/^\s+//;
+ $vgname =~ s/\s+$//;
$this->{lvm} = 1;
$this->{lvmgroup} = $vgname;
qxx ("vgchange -a y $vgname 2>&1");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWICommandLine.pm
new/kiwi/modules/KIWICommandLine.pm
--- old/kiwi/modules/KIWICommandLine.pm 2012-03-16 14:27:44.000000000 +0100
+++ new/kiwi/modules/KIWICommandLine.pm 2012-04-04 14:47:00.000000000 +0200
@@ -20,7 +20,7 @@
use strict;
use warnings;
require Exporter;
-use Digest::MD5 qw (md5_base64);
+use Digest::MD5 qw (md5_hex);
use File::Spec;
use KIWILocator;
use KIWILog;
@@ -776,7 +776,7 @@
my $msg = "No repo alias defined, generating time based
name.\n";
$kiwi -> loginfo ($msg);
my $curTime = time;
- $repoAlias = 'genName_' . md5_base64($repo);
+ $repoAlias = 'genName_' . md5_hex($repo);
}
if (! $repoPrio) {
my $msg = "No repo priority specified, using default value
'10'\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIConfig.txt
new/kiwi/modules/KIWIConfig.txt
--- old/kiwi/modules/KIWIConfig.txt 2012-03-16 14:27:44.000000000 +0100
+++ new/kiwi/modules/KIWIConfig.txt 2012-04-04 14:47:00.000000000 +0200
@@ -244,6 +244,7 @@
<file name="libsysfs"/>
<file name="libutempter"/>
<file name="libutil"/>
+ <file name="libkmod"/>
</strip>
</initrd>
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-03-23 14:41:02.000000000 +0100
+++ new/kiwi/modules/KIWIGlobals.pm 2012-04-04 14:47:04.000000000 +0200
@@ -42,7 +42,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.02.20";
+ $data{Version} = "5.02.22";
$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-03-23 14:41:02.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh 2012-04-04 14:47:00.000000000 +0200
@@ -32,8 +32,8 @@
#======================================
# Exports (console)
#--------------------------------------
-test -z $ELOG_BOOTSHELL && export ELOG_BOOTSHELL=/dev/tty2
-test -z $ELOG_EXCEPTION && export ELOG_EXCEPTION=/dev/console
+test -z "$ELOG_BOOTSHELL" && export ELOG_BOOTSHELL=/dev/tty2
+test -z "$ELOG_EXCEPTION" && export ELOG_EXCEPTION=/dev/console
#======================================
# Exports (General)
@@ -2446,7 +2446,7 @@
if [ -z "$UNIONFS_CONFIG" ]; then
echo "$diskByID / $FSTYPE defaults 1 1" >> $nfstab
else
- echo "/dev/root / defaults 1 1" >> $nfstab
+ echo "/dev/root / auto defaults 1 1" >> $nfstab
fi
#======================================
# check for LVM volume setup
@@ -2526,12 +2526,16 @@
# which has a mount point defined.
# ----
local prefix=$1
+ local sysroot=$2
local nfstab=$prefix/etc/fstab
local index=0
local field=0
local count=0
local device
local IFS=","
+ if [ -z "$sysroot" ];then
+ sysroot=/mnt
+ fi
for i in $PART;do
field=0
count=$((count + 1))
@@ -2555,8 +2559,8 @@
fi
probeFileSystem $device
if [ ! "$FSTYPE" = "luks" ] && [ ! "$FSTYPE" =
"unknown" ];then
- if [ ! -d $prefix/$partMount ];then
- mkdir -p $prefix/$partMount
+ if [ ! -d $sysroot/$partMount ];then
+ mkdir -p $sysroot/$partMount
fi
echo "$device $partMount $FSTYPE defaults 0 0"
>> $nfstab
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIManager.pm
new/kiwi/modules/KIWIManager.pm
--- old/kiwi/modules/KIWIManager.pm 2012-03-16 14:27:44.000000000 +0100
+++ new/kiwi/modules/KIWIManager.pm 2012-04-04 14:47:00.000000000 +0200
@@ -777,7 +777,9 @@
if ($manager eq "zypper") {
my @zypper = @{$this->{zypper}};
my $stype = "private";
+ undef $ENV{ZYPP_LOCKFILE_ROOT};
if (! $chroot) {
+ $ENV{ZYPP_LOCKFILE_ROOT} = $root;
$stype = "public";
}
if ($chroot) {
@@ -1057,7 +1059,9 @@
my @zypper = @{$this->{zypper}};
my @list = @channelList;
my $cmds;
+ undef $ENV{ZYPP_LOCKFILE_ROOT};
if (! $chroot) {
+ $ENV{ZYPP_LOCKFILE_ROOT} = $root;
$cmds = "@zypper --root $root removerepo";
} else {
@zypper = @{$this->{zypper_chroot}};
@@ -1995,6 +1999,7 @@
print $fd "export YAST_IS_RUNNING=true\n";
print $fd "export
ZYPP_CONF=".$root."/".$this->{zyppconf}."\n";
print $fd "export ZYPP_ARIA2C=0\n";
+ print $fd "export ZYPP_LOCKFILE_ROOT=$root\n";
if (@newprods) {
print $fd "@zypper --root $root install ";
print $fd "@installOpts -t product @newprods
&\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWISatSolver.pm
new/kiwi/modules/KIWISatSolver.pm
--- old/kiwi/modules/KIWISatSolver.pm 2012-03-16 14:27:44.000000000 +0100
+++ new/kiwi/modules/KIWISatSolver.pm 2012-04-04 14:47:00.000000000 +0200
@@ -182,28 +182,30 @@
}
$pool -> prepare();
$job = $pool->create_request();
+ my %jobs = ();
foreach my $p (@{$pref}) {
- my @names = $p;
if (! defined $solvep) {
- push (@names, "pattern:".$p);
- push (@names, "patterns-openSUSE-".$p);
+ # given names should be solved as patterns...
+ $jobs{"pattern:".$p} = $p;
+ $jobs{"patterns-openSUSE-".$p} = $p;
+ } else {
+ # given names are passed directly...
+ $jobs{$p} = $p;
}
- my $id = 0;
- my $item = "";
- foreach my $name (@names) {
- if ($name =~ /^product:/) {
- # can't solve products...
- next;
- }
- my $item = $pool->find($name);
- if ((! $item) && (! $quiet)) {
- $kiwi -> warning ("--> Failed to queue job:
$name");
- $kiwi -> skipped ();
- push @jobFailed, $name;
- next;
- }
- $job -> install ($item);
+ }
+ foreach my $name (sort keys %jobs) {
+ if ($name =~ /^product:/) {
+ # can't solve products...
+ next;
+ }
+ my $item = $pool->find($name);
+ if ((! $item) && (! $quiet)) {
+ $kiwi -> warning ("--> Failed to queue job: $name");
+ $kiwi -> skipped ();
+ push @jobFailed, $name;
+ next;
}
+ $job -> install ($item);
}
#==========================================
# Store object data
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm
--- old/kiwi/modules/KIWIXML.pm 2012-03-16 14:27:44.000000000 +0100
+++ new/kiwi/modules/KIWIXML.pm 2012-04-04 14:47:00.000000000 +0200
@@ -3647,7 +3647,15 @@
undef,undef,$ptype
);
if (! defined $psolve) {
- $kiwi -> warning ("SaT solver setup failed");
+ $kiwi -> error ("SaT solver setup failed");
+ return;
+ }
+ if ($psolve -> getProblemsCount()) {
+ $kiwi -> error ("SaT solver problems found !\n");
+ return;
+ }
+ if (@{$psolve -> getFailedJobs()}) {
+ $kiwi -> error ("SaT solver failed jobs found !");
return;
}
%meta = $psolve -> getMetaData();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-dump
new/kiwi/system/boot/armv7l/oemboot/suse-dump
--- old/kiwi/system/boot/armv7l/oemboot/suse-dump 2012-03-23
14:41:02.000000000 +0100
+++ new/kiwi/system/boot/armv7l/oemboot/suse-dump 2012-04-04
14:47:00.000000000 +0200
@@ -208,9 +208,10 @@
dsizeMB=`expr $dsize / 1024`
if [ "$dsizeMB" -gt 0 ];then
Echo -b "Disk $count -> $i [ $dsizeMB MB ]"
+ deviceLinux[$count]=$i
deviceArray[$count]=$dbyid
deviceDSize[$count]=$dsize
- count=`expr $count + 1`
+ count=$((count + 1))
fi
done
if [ "$count" = "1" ];then
@@ -920,14 +921,14 @@
#======================================
# find index for device in deviceArray
#--------------------------------------
- for device in $deviceDisks;do
- if [ $device = $ux_device ];then
+ for device in ${deviceLinux[*]}; do
+ if [ "$device" = "$ux_device" ];then
+ instDisk=${deviceArray[$count]}
break
fi
count=$((count + 1))
done
- instDisk=${deviceArray[$count]}
- if [ ! -e $instDisk ];then
+ if [ ! -e "$instDisk" ];then
systemException \
"Storage ID: $instDisk not found" \
"reboot"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc
new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc
--- old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2012-03-16
14:27:44.000000000 +0100
+++ new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2012-04-04
14:47:04.000000000 +0200
@@ -280,6 +280,19 @@
export KIWI_INITRD_PARAMS
fi
if [ "$haveLVM" = "yes" ] && [ ! -z "$allFreeVolume" ];then
+ if \
+ [ -z "$DONT_PARTITION" ] && \
+ [ ! -z "$OEM_SYSTEMSIZE" ] && \
+ [ "$allFreeVolume" != "LVRoot" ]
+ then
+ # /.../
+ # resize root filesystem prior to the resize of the
+ # allFree volume. If systemsize _and_ allFree volume
+ # is specified we have to resize both, the root
+ # filesystem and the allFree filesystem
+ # ----
+ resizeFilesystem $deviceResize
+ fi
deviceResize=/dev/$VGROUP/$allFreeVolume
fi
if [ ! -z "$deviceResize" ] && partitionSize $deviceResize
&>/dev/null;then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-repart
new/kiwi/system/boot/armv7l/oemboot/suse-repart
--- old/kiwi/system/boot/armv7l/oemboot/suse-repart 2012-03-16
14:27:44.000000000 +0100
+++ new/kiwi/system/boot/armv7l/oemboot/suse-repart 2012-04-04
14:47:00.000000000 +0200
@@ -116,6 +116,12 @@
swapParam=no
cowpParam=no
#======================================
+ # close open device mappings
+ #--------------------------------------
+ if [ "$haveLuks" = "yes" ];then
+ luksClose
+ fi
+ #======================================
# clean/backup boot partition
#--------------------------------------
if [ "$haveBootPartition" = "yes" ];then
@@ -247,6 +253,12 @@
swapParam=no
recoParam=no
#======================================
+ # close open device mappings
+ #--------------------------------------
+ if [ "$haveLuks" = "yes" ];then
+ luksClose
+ fi
+ #======================================
# count partitions to be created
#--------------------------------------
if [ -z "$OEM_WITHOUTSWAP" ];then
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 2012-03-16
14:27:44.000000000 +0100
+++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2012-04-04
14:47:04.000000000 +0200
@@ -499,9 +499,12 @@
fetchFile $imageName $imageDevice $imageZipped
$imageServer
multicast=$multicast_old
if test $loadCode != 0 || ! loadOK "$loadStatus";then
- systemException \
- "Download of $imageName failed:
$loadStatus" \
- "reboot"
+ if [ "$imageZipped" = "compressed" ]; then
+ Echo "Download of compressed
$imageName.gz failed:"
+ else
+ Echo "Download of $imageName failed:"
+ fi
+ systemException "$loadStatus" "reboot"
fi
# /.../
# check the md5sum of the downloaded data records
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-dump
new/kiwi/system/boot/ix86/oemboot/suse-dump
--- old/kiwi/system/boot/ix86/oemboot/suse-dump 2012-03-23 14:41:02.000000000
+0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2012-04-04 14:47:00.000000000
+0200
@@ -208,9 +208,10 @@
dsizeMB=`expr $dsize / 1024`
if [ "$dsizeMB" -gt 0 ];then
Echo -b "Disk $count -> $i [ $dsizeMB MB ]"
+ deviceLinux[$count]=$i
deviceArray[$count]=$dbyid
deviceDSize[$count]=$dsize
- count=`expr $count + 1`
+ count=$((count + 1))
fi
done
if [ "$count" = "1" ];then
@@ -920,14 +921,14 @@
#======================================
# find index for device in deviceArray
#--------------------------------------
- for device in $deviceDisks;do
- if [ $device = $ux_device ];then
+ for device in ${deviceLinux[*]}; do
+ if [ "$device" = "$ux_device" ];then
+ instDisk=${deviceArray[$count]}
break
fi
count=$((count + 1))
done
- instDisk=${deviceArray[$count]}
- if [ ! -e $instDisk ];then
+ if [ ! -e "$instDisk" ];then
systemException \
"Storage ID: $instDisk not found" \
"reboot"
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 2012-03-16
14:27:44.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2012-04-04
14:47:04.000000000 +0200
@@ -280,6 +280,19 @@
export KIWI_INITRD_PARAMS
fi
if [ "$haveLVM" = "yes" ] && [ ! -z "$allFreeVolume" ];then
+ if \
+ [ -z "$DONT_PARTITION" ] && \
+ [ ! -z "$OEM_SYSTEMSIZE" ] && \
+ [ "$allFreeVolume" != "LVRoot" ]
+ then
+ # /.../
+ # resize root filesystem prior to the resize of the
+ # allFree volume. If systemsize _and_ allFree volume
+ # is specified we have to resize both, the root
+ # filesystem and the allFree filesystem
+ # ----
+ resizeFilesystem $deviceResize
+ fi
deviceResize=/dev/$VGROUP/$allFreeVolume
fi
if [ ! -z "$deviceResize" ] && partitionSize $deviceResize
&>/dev/null;then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-repart
new/kiwi/system/boot/ix86/oemboot/suse-repart
--- old/kiwi/system/boot/ix86/oemboot/suse-repart 2012-03-23
14:41:02.000000000 +0100
+++ new/kiwi/system/boot/ix86/oemboot/suse-repart 2012-04-04
14:47:00.000000000 +0200
@@ -116,6 +116,12 @@
swapParam=no
cowpParam=no
#======================================
+ # close open device mappings
+ #--------------------------------------
+ if [ "$haveLuks" = "yes" ];then
+ luksClose
+ fi
+ #======================================
# clean/backup boot partition
#--------------------------------------
if [ "$haveBootPartition" = "yes" ];then
@@ -247,6 +253,12 @@
swapParam=no
recoParam=no
#======================================
+ # close open device mappings
+ #--------------------------------------
+ if [ "$haveLuks" = "yes" ];then
+ luksClose
+ fi
+ #======================================
# count partitions to be created
#--------------------------------------
if [ -z "$OEM_WITHOUTSWAP" ];then
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 2012-03-16
14:27:44.000000000 +0100
+++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2012-04-04
14:47:04.000000000 +0200
@@ -499,9 +499,12 @@
fetchFile $imageName $imageDevice $imageZipped
$imageServer
multicast=$multicast_old
if test $loadCode != 0 || ! loadOK "$loadStatus";then
- systemException \
- "Download of $imageName failed:
$loadStatus" \
- "reboot"
+ if [ "$imageZipped" = "compressed" ]; then
+ Echo "Download of compressed
$imageName.gz failed:"
+ else
+ Echo "Download of $imageName failed:"
+ fi
+ systemException "$loadStatus" "reboot"
fi
# /.../
# check the md5sum of the downloaded data records
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-dump
new/kiwi/system/boot/ppc/oemboot/suse-dump
--- old/kiwi/system/boot/ppc/oemboot/suse-dump 2012-03-23 14:41:02.000000000
+0100
+++ new/kiwi/system/boot/ppc/oemboot/suse-dump 2012-04-04 14:47:00.000000000
+0200
@@ -208,9 +208,10 @@
dsizeMB=`expr $dsize / 1024`
if [ "$dsizeMB" -gt 0 ];then
Echo -b "Disk $count -> $i [ $dsizeMB MB ]"
+ deviceLinux[$count]=$i
deviceArray[$count]=$dbyid
deviceDSize[$count]=$dsize
- count=`expr $count + 1`
+ count=$((count + 1))
fi
done
if [ "$count" = "1" ];then
@@ -920,14 +921,14 @@
#======================================
# find index for device in deviceArray
#--------------------------------------
- for device in $deviceDisks;do
- if [ $device = $ux_device ];then
+ for device in ${deviceLinux[*]}; do
+ if [ "$device" = "$ux_device" ];then
+ instDisk=${deviceArray[$count]}
break
fi
count=$((count + 1))
done
- instDisk=${deviceArray[$count]}
- if [ ! -e $instDisk ];then
+ if [ ! -e "$instDisk" ];then
systemException \
"Storage ID: $instDisk not found" \
"reboot"
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 2012-03-16
14:27:44.000000000 +0100
+++ new/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2012-04-04
14:47:04.000000000 +0200
@@ -280,6 +280,19 @@
export KIWI_INITRD_PARAMS
fi
if [ "$haveLVM" = "yes" ] && [ ! -z "$allFreeVolume" ];then
+ if \
+ [ -z "$DONT_PARTITION" ] && \
+ [ ! -z "$OEM_SYSTEMSIZE" ] && \
+ [ "$allFreeVolume" != "LVRoot" ]
+ then
+ # /.../
+ # resize root filesystem prior to the resize of the
+ # allFree volume. If systemsize _and_ allFree volume
+ # is specified we have to resize both, the root
+ # filesystem and the allFree filesystem
+ # ----
+ resizeFilesystem $deviceResize
+ fi
deviceResize=/dev/$VGROUP/$allFreeVolume
fi
if [ ! -z "$deviceResize" ] && partitionSize $deviceResize
&>/dev/null;then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-repart
new/kiwi/system/boot/ppc/oemboot/suse-repart
--- old/kiwi/system/boot/ppc/oemboot/suse-repart 2012-03-16
14:27:44.000000000 +0100
+++ new/kiwi/system/boot/ppc/oemboot/suse-repart 2012-04-04
14:47:00.000000000 +0200
@@ -116,6 +116,12 @@
swapParam=no
cowpParam=no
#======================================
+ # close open device mappings
+ #--------------------------------------
+ if [ "$haveLuks" = "yes" ];then
+ luksClose
+ fi
+ #======================================
# clean/backup boot partition
#--------------------------------------
if [ "$haveBootPartition" = "yes" ];then
@@ -247,6 +253,12 @@
swapParam=no
recoParam=no
#======================================
+ # close open device mappings
+ #--------------------------------------
+ if [ "$haveLuks" = "yes" ];then
+ luksClose
+ fi
+ #======================================
# count partitions to be created
#--------------------------------------
if [ -z "$OEM_WITHOUTSWAP" ];then
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 2012-03-16
14:27:44.000000000 +0100
+++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2012-04-04
14:47:04.000000000 +0200
@@ -515,9 +515,12 @@
fetchFile $imageName $imageDevice $imageZipped
$imageServer
multicast=$multicast_old
if test $loadCode != 0 || ! loadOK "$loadStatus";then
- systemException \
- "Download of $imageName failed:
$loadStatus" \
- "reboot"
+ if [ "$imageZipped" = "compressed" ]; then
+ Echo "Download of compressed
$imageName.gz failed:"
+ else
+ Echo "Download of $imageName failed:"
+ fi
+ systemException "$loadStatus" "reboot"
fi
# /.../
# check the md5sum of the downloaded data records
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-dump
new/kiwi/system/boot/s390/oemboot/suse-dump
--- old/kiwi/system/boot/s390/oemboot/suse-dump 2012-03-23 14:41:02.000000000
+0100
+++ new/kiwi/system/boot/s390/oemboot/suse-dump 2012-04-04 14:47:00.000000000
+0200
@@ -208,9 +208,10 @@
dsizeMB=`expr $dsize / 1024`
if [ "$dsizeMB" -gt 0 ];then
Echo -b "Disk $count -> $i [ $dsizeMB MB ]"
+ deviceLinux[$count]=$i
deviceArray[$count]=$dbyid
deviceDSize[$count]=$dsize
- count=`expr $count + 1`
+ count=$((count + 1))
fi
done
if [ "$count" = "1" ];then
@@ -920,14 +921,14 @@
#======================================
# find index for device in deviceArray
#--------------------------------------
- for device in $deviceDisks;do
- if [ $device = $ux_device ];then
+ for device in ${deviceLinux[*]}; do
+ if [ "$device" = "$ux_device" ];then
+ instDisk=${deviceArray[$count]}
break
fi
count=$((count + 1))
done
- instDisk=${deviceArray[$count]}
- if [ ! -e $instDisk ];then
+ if [ ! -e "$instDisk" ];then
systemException \
"Storage ID: $instDisk not found" \
"reboot"
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 2012-03-16
14:27:44.000000000 +0100
+++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2012-04-04
14:47:04.000000000 +0200
@@ -284,6 +284,19 @@
export KIWI_INITRD_PARAMS
fi
if [ "$haveLVM" = "yes" ] && [ ! -z "$allFreeVolume" ];then
+ if \
+ [ -z "$DONT_PARTITION" ] && \
+ [ ! -z "$OEM_SYSTEMSIZE" ] && \
+ [ "$allFreeVolume" != "LVRoot" ]
+ then
+ # /.../
+ # resize root filesystem prior to the resize of the
+ # allFree volume. If systemsize _and_ allFree volume
+ # is specified we have to resize both, the root
+ # filesystem and the allFree filesystem
+ # ----
+ resizeFilesystem $deviceResize
+ fi
deviceResize=/dev/$VGROUP/$allFreeVolume
fi
if [ ! -z "$deviceResize" ] && partitionSize $deviceResize
&>/dev/null;then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-repart
new/kiwi/system/boot/s390/oemboot/suse-repart
--- old/kiwi/system/boot/s390/oemboot/suse-repart 2012-03-16
14:27:44.000000000 +0100
+++ new/kiwi/system/boot/s390/oemboot/suse-repart 2012-04-04
14:47:00.000000000 +0200
@@ -117,6 +117,12 @@
swapParam=no
cowpParam=no
#======================================
+ # close open device mappings
+ #--------------------------------------
+ if [ "$haveLuks" = "yes" ];then
+ luksClose
+ fi
+ #======================================
# clean/backup boot partition
#--------------------------------------
if [ "$haveBootPartition" = "yes" ];then
@@ -248,6 +254,12 @@
swapParam=no
recoParam=no
#======================================
+ # close open device mappings
+ #--------------------------------------
+ if [ "$haveLuks" = "yes" ];then
+ luksClose
+ fi
+ #======================================
# count partitions to be created
#--------------------------------------
if [ -z "$OEM_WITHOUTSWAP" ];then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/xsl/convert49to50.xsl
new/kiwi/xsl/convert49to50.xsl
--- old/kiwi/xsl/convert49to50.xsl 2011-10-18 12:50:04.000000000 +0200
+++ new/kiwi/xsl/convert49to50.xsl 2012-04-04 14:47:04.000000000 +0200
@@ -59,7 +59,7 @@
<xsl:copy-of select="@boot"/>
</xsl:otherwise>
</xsl:choose>
- <xsl:apply-templates mode="xenmode"/>
+ <xsl:apply-templates mode="conv49to50"/>
</xsl:when>
<xsl:otherwise>
<xsl:copy-of select="@*"/>
@@ -69,15 +69,23 @@
</type>
</xsl:template>
-<!-- add domain="domU" to machine section if in xen mode -->
-<xsl:template match="machine" mode="xenmode">
- <machine>
- <xsl:attribute name="domain">
- <xsl:text>domU</xsl:text>
- </xsl:attribute>
- <xsl:copy-of select="@*"/>
- <xsl:apply-templates mode="conv49to50"/>
- </machine>
+<!-- add domain="domU" to machine section if parent is in xen mode -->
+<xsl:template match="type/machine" mode="conv49to50">
+ <machine>
+ <xsl:choose>
+ <xsl:when test="../@image='xen'">
+ <xsl:attribute name="domain">
+ <xsl:text>domU</xsl:text>
+ </xsl:attribute>
+ <xsl:copy-of select="@*"/>
+ <xsl:apply-templates mode="conv49to50"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:copy-of select="@*"/>
+ <xsl:apply-templates mode="conv49to50"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </machine>
</xsl:template>
</xsl:stylesheet>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
