Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Fri Oct 7 17:07:28 CEST 2011.
--------
--- openSUSE:Factory/kiwi/kiwi.changes 2011-10-07 00:48:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-10-07
15:27:03.000000000 +0200
@@ -1,0 +2,29 @@
+Fri Oct 7 15:08:21 CEST 2011 - m...@suse.de
+
+- v4.97.4 released
+
+-------------------------------------------------------------------
+Fri Oct 7 14:35:00 CEST 2011 - m...@suse.de
+
+- make sure updateOtherDeviceFstab creates the mount point
+
+-------------------------------------------------------------------
+Fri Oct 7 11:06:10 CEST 2011 - m...@suse.de
+
+- activate only volume group stored in $VGROUP, prevent vgscan
+
+-------------------------------------------------------------------
+Fri Oct 7 09:56:44 CEST 2011 - m...@suse.de
+
+- fixed luksOpen to generate unique name for luksroot
+- fixed luksOpen to stop asking for the passphrase after 3 times
+- fixed updateOtherDeviceFstab to work in luks and/or RAID env
+- fixed luksOpen to wait until the mapper created the device
+- allow luks_pass to be set on the kernel commandline
+
+-------------------------------------------------------------------
+Thu Oct 6 18:05:00 CEST 2011 - m...@suse.de
+
+- DB: rebuild documentation
+
+-------------------------------------------------------------------
@@ -5,0 +35,4 @@
+
+ Date: Thu Oct 6 11:28:12 2011 -0400
+
+ correct attribute name error, some word smithing around <systemdik>
description
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.Lyah8a/_old 2011-10-07 17:07:21.000000000 +0200
+++ /var/tmp/diff_new_pack.Lyah8a/_new 2011-10-07 17:07:21.000000000 +0200
@@ -69,7 +69,7 @@
%endif
%endif
Summary: OpenSuSE - KIWI Image System
-Version: 4.97.3
+Version: 4.97.4
Release: 1
Group: System/Management
License: GPLv2
++++++ kiwi-docu.tar.bz2 ++++++
openSUSE:Factory/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-10-03 00:00:06.000000000 +0200
+++ new/kiwi/.revision 2011-10-03 00:00:06.000000000 +0200
@@ -1 +1 @@
-63c33a0efc290682aebeb681a06b7665f96f1dda
+421c4d630d280fc85df39a57a9768f1063ff554d
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-06 12:21:56.000000000 +0200
+++ new/kiwi/modules/KIWIGlobals.pm 2011-10-07 15:20:57.000000000 +0200
@@ -40,7 +40,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "4.97.3";
+ $data{Version} = "4.97.4";
$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 2011-10-06 17:59:01.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2011-10-07 15:20:57.000000000 +0200
@@ -2484,9 +2484,18 @@
[ ! "$partMount" = "x" ] && \
[ ! "$partMount" = "/" ]
then
- device=$(ddn $DISK $count)
+ if [ ! -z "$RAID" ];then
+ device=/dev/md$((count - 1))
+ else
+ device=$(ddn $DISK $count)
+ fi
probeFileSystem $device
- echo "$device $partMount $FSTYPE defaults 0 0" >>
$nfstab
+ if [ ! "$FSTYPE" = "luks" ] ; then
+ if [ ! -d $partMount ];then
+ mkdir -p $partMount
+ fi
+ echo "$device $partMount $FSTYPE defaults 0 0"
>> $nfstab
+ fi
fi
done
}
@@ -3536,12 +3545,8 @@
if [ ! "$kiwi_lvm" = "true" ];then
return 1
fi
- Echo "Searching for $VGROUP volume group..."
- if vgscan 2>&1 | grep -q "$VGROUP"; then
- vgchange -a y $VGROUP
- return $?
- fi
- return 1
+ Echo "Activating $VGROUP volume group..."
+ vgchange -a y $VGROUP
}
#======================================
# searchSwapSpace
@@ -5878,8 +5883,10 @@
local rwDevice=`getDiskID $1`
local roDevice=`getDiskID $2`
local unionFST=$3
- rwDeviceLuks=$(luksOpen $rwDevice luksReadWrite)
- roDeviceLuks=$(luksOpen $roDevice luksReadOnly)
+ luksOpen $rwDevice luksReadWrite
+ rwDeviceLuks=$luksDeviceOpened
+ luksOpen $roDevice luksReadOnly
+ roDeviceLuks=$luksDeviceOpened
if [ ! $rwDeviceLuks = $rwDevice ];then
rwDevice=$rwDeviceLuks
export haveLuks="yes"
@@ -6041,31 +6048,48 @@
# ----
local ldev=$1
local name=$2
+ local retry=1
local info
- if [ -z $name ];then
- name=luksroot
+ if [ -z "$name" ];then
+ name=luks_$(basename $ldev)
fi
if [ -e /dev/mapper/$name ];then
- echo /dev/mapper/$name; return
+ export luksDeviceOpened=/dev/mapper/$name
+ return
fi
if ! cryptsetup isLuks $ldev &>/dev/null;then
- echo $ldev; return
+ export luksDeviceOpened=$ldev
+ return
+ fi
+ if [ ! -z "$luks_pass" ];then
+ echo $luks_pass > /tmp/luks
fi
while true;do
if [ ! -e /tmp/luks ];then
+ Echo "Try: $retry"
LUKS_OPEN=$(runInteractive \
"--stdout --insecure --passwordbox
"\"$TEXT_LUKS\"" 10 60"
)
echo $LUKS_OPEN > /tmp/luks
fi
- info=$(cat /tmp/luks | cryptsetup luksOpen $ldev $name 2>&1)
- if [ $? = 0 ];then
+ if cat /tmp/luks | cryptsetup luksOpen $ldev $name;then
break
fi
rm -f /tmp/luks
- Dialog --stdout --timeout 10 --msgbox "\"Error: $info\"" 8 60
+ unset luks_pass
+ if [ $retry -eq 3 ];then
+ systemException \
+ "Max retries reached... reboot" \
+ "reboot"
+ fi
+ retry=$(($retry + 1))
done
- echo /dev/mapper/$name
+ if ! waitForStorageDevice /dev/mapper/$name &>/dev/null;then
+ systemException \
+ "LUKS map /dev/mapper/$name doesn't appear... fatal !" \
+ "reboot"
+ fi
+ export luksDeviceOpened=/dev/mapper/$name
}
#======================================
# luksResize
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-06
12:21:56.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2011-10-07
15:20:58.000000000 +0200
@@ -176,7 +176,8 @@
if [ -z "$UNIONFS_CONFIG" ];then
probeFileSystem $imageDevice
if [ "$FSTYPE" = "luks" ];then
- imageDevice=$(luksOpen $imageDevice)
+ luksOpen $imageDevice
+ imageDevice=$luksDeviceOpened
probeFileSystem $imageDevice
export haveLuks=yes
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-06
12:21:56.000000000 +0200
+++ new/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2011-10-07
15:20:58.000000000 +0200
@@ -177,7 +177,8 @@
if [ -z "$UNIONFS_CONFIG" ];then
probeFileSystem $imageDevice
if [ "$FSTYPE" = "luks" ];then
- imageDevice=$(luksOpen $imageDevice)
+ luksOpen $imageDevice
+ imageDevice=$luksDeviceOpened
probeFileSystem $imageDevice
export haveLuks=yes
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-10-03
00:00:07.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-10-07
15:20:58.000000000 +0200
@@ -309,7 +309,8 @@
if linuxPartition $imageDiskDevice;then
probeFileSystem $imageDevice
if [ "$FSTYPE" = "luks" ];then
- imageDevice=$(luksOpen $imageDevice)
+ luksOpen $imageDevice
+ imageDevice=$luksDeviceOpened
imageRODevice=$imageDevice
probeFileSystem $imageRootDevice
export haveLuks=yes
@@ -772,7 +773,8 @@
if [ -b $imageRootDevice ];then
probeFileSystem $imageRootDevice
if [ "$FSTYPE" = "luks" ];then
- imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ imageRootDevice=$luksDeviceOpened
imageRODevice=$imageRootDevice
probeFileSystem $imageRootDevice
export haveLuks=yes
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 2011-10-06
17:59:01.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2011-10-07
15:20:58.000000000 +0200
@@ -119,7 +119,8 @@
# Check for LUKS extension on root fs
#--------------------------------------
if [ "$FSTYPE" = "luks" ];then
- imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ imageRootDevice=$luksDeviceOpened
if [ -e /dev/$VGROUP/LVComp ];then
imageRODevice=$imageRootDevice
fi
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 2011-10-03
00:00:07.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-repart 2011-10-07
15:20:58.000000000 +0200
@@ -777,9 +777,11 @@
# createLuksMaps
#--------------------------------------
function createLuksMaps {
- export imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ export imageRootDevice=$luksDeviceOpened
if isFSTypeReadOnly;then
- export imageIOWRDevice=$(luksOpen $imageIOWRDevice
luksReadWrite)
+ luksOpen $imageIOWRDevice luksReadWrite
+ export imageIOWRDevice=$luksDeviceOpened
export imageRWDevice=$imageIOWRDevice
export imageRODevice=$imageRootDevice
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc
new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc
--- old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2011-10-03
00:00:07.000000000 +0200
+++ new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2011-10-07
15:20:58.000000000 +0200
@@ -170,7 +170,8 @@
#--------------------------------------
probeFileSystem $imageRootDevice
if [ "$FSTYPE" = "luks" ];then
- imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ imageRootDevice=$luksDeviceOpened
imageRODevice=$imageRootDevice
probeFileSystem $imageRootDevice
export haveLuks=yes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc
new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2011-10-06
17:59:01.000000000 +0200
+++ new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2011-10-07
15:20:58.000000000 +0200
@@ -171,7 +171,8 @@
#--------------------------------------
probeFileSystem $imageRootDevice
if [ "$FSTYPE" = "luks" ];then
- imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ imageRootDevice=$luksDeviceOpened
imageRODevice=$imageRootDevice
probeFileSystem $imageRootDevice
export haveLuks=yes
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-03
00:00:07.000000000 +0200
+++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2011-10-07
15:20:58.000000000 +0200
@@ -309,7 +309,8 @@
if linuxPartition $imageDiskDevice;then
probeFileSystem $imageDevice
if [ "$FSTYPE" = "luks" ];then
- imageDevice=$(luksOpen $imageDevice)
+ luksOpen $imageDevice
+ imageDevice=$luksDeviceOpened
imageRODevice=$imageDevice
probeFileSystem $imageRootDevice
export haveLuks=yes
@@ -772,7 +773,8 @@
if [ -b $imageRootDevice ];then
probeFileSystem $imageRootDevice
if [ "$FSTYPE" = "luks" ];then
- imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ imageRootDevice=$luksDeviceOpened
imageRODevice=$imageRootDevice
probeFileSystem $imageRootDevice
export haveLuks=yes
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 2011-10-06
17:59:01.000000000 +0200
+++ new/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2011-10-07
15:20:58.000000000 +0200
@@ -119,7 +119,8 @@
# Check for LUKS extension on root fs
#--------------------------------------
if [ "$FSTYPE" = "luks" ];then
- imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ imageRootDevice=$luksDeviceOpened
probeFileSystem $imageRootDevice
export haveLuks=yes
fi
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 2011-10-03
00:00:07.000000000 +0200
+++ new/kiwi/system/boot/ppc/oemboot/suse-repart 2011-10-07
15:20:58.000000000 +0200
@@ -791,9 +791,11 @@
# createLuksMaps
#--------------------------------------
function createLuksMaps {
- export imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ export imageRootDevice=$luksDeviceOpened
if isFSTypeReadOnly;then
- export imageIOWRDevice=$(luksOpen $imageIOWRDevice
luksReadWrite)
+ luksOpen $imageIOWRDevice luksReadWrite
+ export imageIOWRDevice=$luksDeviceOpened
export imageRWDevice=$imageIOWRDevice
export imageRODevice=$imageRootDevice
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc
new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2011-10-06
17:59:01.000000000 +0200
+++ new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2011-10-07
15:20:58.000000000 +0200
@@ -172,7 +172,8 @@
#--------------------------------------
probeFileSystem $imageRootDevice
if [ "$FSTYPE" = "luks" ];then
- imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ imageRootDevice=$luksDeviceOpened
imageRODevice=$imageRootDevice
probeFileSystem $imageRootDevice
export haveLuks=yes
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-03
00:00:07.000000000 +0200
+++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2011-10-07
15:20:58.000000000 +0200
@@ -309,7 +309,8 @@
if linuxPartition $imageDiskDevice;then
probeFileSystem $imageDevice
if [ "$FSTYPE" = "luks" ];then
- imageDevice=$(luksOpen $imageDevice)
+ luksOpen $imageDevice
+ imageDevice=$luksDeviceOpened
imageRODevice=$imageDevice
probeFileSystem $imageRootDevice
export haveLuks=yes
@@ -772,7 +773,8 @@
if [ -b $imageRootDevice ];then
probeFileSystem $imageRootDevice
if [ "$FSTYPE" = "luks" ];then
- imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ imageRootDevice=$luksDeviceOpened
imageRODevice=$imageRootDevice
probeFileSystem $imageRootDevice
export haveLuks=yes
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 2011-10-06
17:59:01.000000000 +0200
+++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2011-10-07
15:20:58.000000000 +0200
@@ -119,7 +119,8 @@
# Check for LUKS extension on root fs
#--------------------------------------
if [ "$FSTYPE" = "luks" ];then
- imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ imageRootDevice=$luksDeviceOpened
probeFileSystem $imageRootDevice
export haveLuks=yes
fi
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 2011-10-03
00:00:07.000000000 +0200
+++ new/kiwi/system/boot/s390/oemboot/suse-repart 2011-10-07
15:20:59.000000000 +0200
@@ -801,9 +801,11 @@
# createLuksMaps
#--------------------------------------
function createLuksMaps {
- export imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ export imageRootDevice=$luksDeviceOpened
if isFSTypeReadOnly;then
- export imageIOWRDevice=$(luksOpen $imageIOWRDevice
luksReadWrite)
+ luksOpen $imageIOWRDevice luksReadWrite
+ export imageIOWRDevice=$luksDeviceOpened
export imageRWDevice=$imageIOWRDevice
export imageRODevice=$imageRootDevice
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-linuxrc
new/kiwi/system/boot/s390/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2011-10-06
17:59:01.000000000 +0200
+++ new/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2011-10-07
15:20:59.000000000 +0200
@@ -175,7 +175,8 @@
#--------------------------------------
probeFileSystem $imageRootDevice
if [ "$FSTYPE" = "luks" ];then
- imageRootDevice=$(luksOpen $imageRootDevice)
+ luksOpen $imageRootDevice
+ imageRootDevice=$luksDeviceOpened
imageRODevice=$imageRootDevice
probeFileSystem $imageRootDevice
export haveLuks=yes
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
