Author: fehr Date: Wed Feb 10 12:21:03 2010 New Revision: 60782 URL: http://svn.opensuse.org/viewcvs/yast?rev=60782&view=rev Log: - provide name of encrypted dm device in "crypt_device" key of volume data if dm encryption is set up (#577127) - 2.19.6 Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=60782&r1=60781&r2=60782&view=diff ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Wed Feb 10 12:21:03 2010 @@ -1 +1 @@ -2.19.5 +2.19.6 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=60782&r1=60781&r2=60782&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Feb 10 12:21:03 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 10 12:19:00 CET 2010 - fehr@suse.de + +- provide name of encrypted dm device in "crypt_device" key of + volume data if dm encryption is set up (#577127) +- 2.19.6 + +------------------------------------------------------------------- Mon Feb 08 14:03:47 CET 2010 - aschnell@suse.de - do not allow deletion of partitions on DASD when other partitions Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=60782&r1=60781&r2=60782&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Feb 10 12:21:03 2010 @@ -1229,6 +1229,9 @@ map volumeMap( any vinfo, map p ) { p["device"] = LibStorage::VolumeInfo::swig_device_get(vinfo); + string tmp = LibStorage::VolumeInfo::swig_crypt_device_get(vinfo); + if( size(tmp)>0 ) + p["crypt_device"] = tmp; p["size_k"] = LibStorage::VolumeInfo::swig_sizeK_get(vinfo); p["name"] = LibStorage::VolumeInfo::swig_name_get(vinfo); integer t = LibStorage::VolumeInfo::swig_fs_get(vinfo); @@ -1244,7 +1247,7 @@ tbool = LibStorage::VolumeInfo::swig_create_get(vinfo); if( tbool ) p["create"] = true; - string tmp = LibStorage::VolumeInfo::swig_mount_get(vinfo); + tmp = LibStorage::VolumeInfo::swig_mount_get(vinfo); if( size(tmp)>0 ) { p["mount"] = tmp; Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?rev=60782&r1=60781&r2=60782&view=diff ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Wed Feb 10 12:21:03 2010 @@ -5,7 +5,7 @@ License: GPL v2 or later BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.19.7 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.19.9 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-testsuite >= 2.19.0 yast2-perl-bindings Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org