Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2011-11-08 17:38:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2011-11-07
14:18:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2011-11-08
17:38:41.000000000 +0100
@@ -1,0 +2,59 @@
+Tue Nov 8 16:18:06 CET 2011 - m...@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 - m...@suse.de
+
+- added options --xattrs and --acls when using rsync
+
+-------------------------------------------------------------------
+Tue Nov 8 11:47:16 CET 2011 - m...@suse.de
+
+- use mktemp to create tmp dir in setupInstallFlags
+
+-------------------------------------------------------------------
+Tue Nov 8 10:21:04 CET 2011 - m...@suse.de
+
+- v4.98.15 released
+
+-------------------------------------------------------------------
+Mon Nov 7 12:46:53 CET 2011 - m...@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 - m...@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 - m...@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 - m...@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 - m...@suse.de
+
+- v4.98.14 released
+
+-------------------------------------------------------------------
+Thu Nov 3 11:35:37 CET 2011 - m...@suse.de
+
+- fixed check for empty variable in shell code
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.96cfub/_old 2011-11-08 17:38:50.000000000 +0100
+++ /var/tmp/diff_new_pack.96cfub/_new 2011-11-08 17:38:50.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.13
+Version: 4.98.15
Release: 1
Group: System/Management
License: GPLv2
++++++ 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 2011-11-03 09:52:25.000000000 +0100
+++ new/kiwi/.revision 2011-11-08 16:21:40.000000000 +0100
@@ -1 +1 @@
-1492b1caec24fa01e08a7c35fabdf1aaccae7b7e
+5f6c38df848ddb7a72a27d786bc29ba598ab7119
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-11-03 09:52:25.000000000 +0100
+++ 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/KIWIGlobals.pm
new/kiwi/modules/KIWIGlobals.pm
--- old/kiwi/modules/KIWIGlobals.pm 2011-11-03 09:52:29.000000000 +0100
+++ 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.13";
+ $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-11-03 09:52:25.000000000 +0100
+++ 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/KIWILinuxRC.sh
new/kiwi/modules/KIWILinuxRC.sh
--- old/kiwi/modules/KIWILinuxRC.sh 2011-11-03 09:52:29.000000000 +0100
+++ 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"
@@ -3684,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 {
@@ -3936,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
@@ -3963,6 +3945,7 @@
"Failed to bring up the network: $instnetdev" \
"reboot"
fi
+ udevPending
}
#======================================
# convertCIDRToNetmask
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-11-03
09:52:25.000000000 +0100
+++ 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-linuxrc
new/kiwi/system/boot/ix86/netboot/suse-linuxrc
--- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-11-03
09:52:29.000000000 +0100
+++ 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
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-11-03
09:52:29.000000000 +0100
+++ 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
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-11-03
09:52:29.000000000 +0100
+++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2011-11-08
16:21:40.000000000 +0100
@@ -105,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
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-11-03
09:52:25.000000000 +0100
+++ new/kiwi/system/boot/s390/netboot/suse-preinit 2011-11-08
16:21:40.000000000 +0100
@@ -136,6 +136,8 @@
# 13) setup static network
#--------------------------------------
if [ "$systemIntegrity" = "clean" ];then
+ setupNetworkInterfaceS390
+ udevPending
setupNetworkStatic 0
fi
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
