Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2013-02-19 13:46:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage", Maintainer is "aschn...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2013-02-08 07:18:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2013-02-19 13:46:27.000000000 +0100 @@ -1,0 +2,31 @@ +Mon Feb 18 14:33:22 CET 2013 - f...@suse.de + +- version 2.23.6 +- fix max size computation with thin pools (bnc#803981) + +------------------------------------------------------------------- +Fri Feb 15 10:00:20 CET 2013 - aschn...@suse.de + +- detect fake partitions on FBA DASDs (bnc#786164) + +------------------------------------------------------------------- +Tue Feb 12 19:02:32 CET 2013 - f...@suse.de + +- allow partitions with id 0x82 for raid creation (bnc#801955) + +------------------------------------------------------------------- +Tue Feb 12 12:58:43 CET 2013 - aschn...@suse.de + +- always display original partition type in combobox (bnc#802360) + +------------------------------------------------------------------- +Mon Feb 11 18:08:09 CET 2013 - aschn...@suse.de + +- fixed reuse of EFI boot partition (bnc#802359) + +------------------------------------------------------------------- +Mon Feb 11 12:53:11 CET 2013 - aschn...@suse.de + +- allow all characters for existing password (bnc#799992) + +------------------------------------------------------------------- Old: ---- yast2-storage-2.23.5.tar.bz2 New: ---- yast2-storage-2.23.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.TdnMXy/_old 2013-02-19 13:46:28.000000000 +0100 +++ /var/tmp/diff_new_pack.TdnMXy/_new 2013-02-19 13:46:28.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 2.23.5 +Version: 2.23.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-2.23.5.tar.bz2 -> yast2-storage-2.23.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/VERSION new/yast2-storage-2.23.6/VERSION --- old/yast2-storage-2.23.5/VERSION 2013-02-07 15:11:36.000000000 +0100 +++ new/yast2-storage-2.23.6/VERSION 2013-02-19 11:52:12.000000000 +0100 @@ -1 +1 @@ -2.23.5 +2.23.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/configure new/yast2-storage-2.23.6/configure --- old/yast2-storage-2.23.5/configure 2013-02-07 15:12:06.000000000 +0100 +++ new/yast2-storage-2.23.6/configure 2013-02-19 12:21:03.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-storage 2.23.5. +# Generated by GNU Autoconf 2.69 for yast2-storage 2.23.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='yast2-storage' PACKAGE_TARNAME='yast2-storage' -PACKAGE_VERSION='2.23.5' -PACKAGE_STRING='yast2-storage 2.23.5' +PACKAGE_VERSION='2.23.6' +PACKAGE_STRING='yast2-storage 2.23.6' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1380,7 +1380,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-storage 2.23.5 to adapt to many kinds of systems. +\`configure' configures yast2-storage 2.23.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1451,7 +1451,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-storage 2.23.5:";; + short | recursive ) echo "Configuration of yast2-storage 2.23.6:";; esac cat <<\_ACEOF @@ -1569,7 +1569,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-storage configure 2.23.5 +yast2-storage configure 2.23.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2022,7 +2022,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-storage $as_me 2.23.5, which was +It was created by yast2-storage $as_me 2.23.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2961,7 +2961,7 @@ # Define the identity of the package. PACKAGE='yast2-storage' - VERSION='2.23.5' + VERSION='2.23.6' cat >>confdefs.h <<_ACEOF @@ -3084,7 +3084,7 @@ -VERSION="2.23.5" +VERSION="2.23.6" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschn...@suse.de>" @@ -16281,7 +16281,7 @@ PERL_VENDORARCH=`perl -V:vendorarch | sed "s!.*='!!;s!'.*!!"` -ac_config_files="$ac_config_files Makefile agents-scr/Makefile bindings/ycp/Makefile bindings/src/Makefile bindings/Makefile data/Makefile disk/src/Makefile disk/Makefile multipath-simple/src/Makefile multipath-simple/Makefile scripts/Makefile storage/data/Makefile storage/doc/autodocs/Makefile storage/doc/Makefile storage/src/include/Makefile storage/src/modules/Makefile storage/src/proposal/Makefile storage/src/testsuite/data/empty/Makefile storage/src/testsuite/data/empty-efi/Makefile storage/src/testsuite/data/half-empty/Makefile storage/src/testsuite/data/reuse-home/Makefile storage/src/testsuite/data/windows/Makefile storage/src/testsuite/data/windows-only/Makefile storage/src/testsuite/data/Makefile storage/src/testsuite/Makefile storage/src/Makefile storage/Makefile" +ac_config_files="$ac_config_files Makefile agents-scr/Makefile bindings/ycp/Makefile bindings/src/Makefile bindings/Makefile data/Makefile disk/src/Makefile disk/Makefile multipath-simple/src/Makefile multipath-simple/Makefile scripts/Makefile storage/data/Makefile storage/doc/autodocs/Makefile storage/doc/Makefile storage/src/include/Makefile storage/src/modules/Makefile storage/src/proposal/Makefile storage/src/testsuite/data/empty/Makefile storage/src/testsuite/data/empty-efi/Makefile storage/src/testsuite/data/half-empty/Makefile storage/src/testsuite/data/reuse-home/Makefile storage/src/testsuite/data/windows/Makefile storage/src/testsuite/data/windows-only/Makefile storage/src/testsuite/data/windows-only-efi/Makefile storage/src/testsuite/data/Makefile storage/src/testsuite/Makefile storage/src/Makefile storage/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16825,7 +16825,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-storage $as_me 2.23.5, which was +This file was extended by yast2-storage $as_me 2.23.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16891,7 +16891,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-storage config.status 2.23.5 +yast2-storage config.status 2.23.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17421,6 +17421,7 @@ "storage/src/testsuite/data/reuse-home/Makefile") CONFIG_FILES="$CONFIG_FILES storage/src/testsuite/data/reuse-home/Makefile" ;; "storage/src/testsuite/data/windows/Makefile") CONFIG_FILES="$CONFIG_FILES storage/src/testsuite/data/windows/Makefile" ;; "storage/src/testsuite/data/windows-only/Makefile") CONFIG_FILES="$CONFIG_FILES storage/src/testsuite/data/windows-only/Makefile" ;; + "storage/src/testsuite/data/windows-only-efi/Makefile") CONFIG_FILES="$CONFIG_FILES storage/src/testsuite/data/windows-only-efi/Makefile" ;; "storage/src/testsuite/data/Makefile") CONFIG_FILES="$CONFIG_FILES storage/src/testsuite/data/Makefile" ;; "storage/src/testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES storage/src/testsuite/Makefile" ;; "storage/src/Makefile") CONFIG_FILES="$CONFIG_FILES storage/src/Makefile" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/configure.in new/yast2-storage-2.23.6/configure.in --- old/yast2-storage-2.23.5/configure.in 2013-02-07 15:11:52.000000000 +0100 +++ new/yast2-storage-2.23.6/configure.in 2013-02-19 12:20:53.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-storage, 2.23.5, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.23.6, http://bugs.opensuse.org/, yast2-storage) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.23.5" +VERSION="2.23.6" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschn...@suse.de>" @@ -225,6 +225,7 @@ storage/src/testsuite/data/reuse-home/Makefile storage/src/testsuite/data/windows/Makefile storage/src/testsuite/data/windows-only/Makefile +storage/src/testsuite/data/windows-only-efi/Makefile storage/src/testsuite/data/Makefile storage/src/testsuite/Makefile storage/src/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.23.6/storage/src/include/custom_part_dialogs.ycp --- old/yast2-storage-2.23.5/storage/src/include/custom_part_dialogs.ycp 2013-01-22 12:12:36.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/include/custom_part_dialogs.ycp 2013-02-12 13:46:35.000000000 +0100 @@ -913,7 +913,7 @@ }); integer id = new_val["fsid"]:0; - if( id != 0 && id<=255 && !contains( added_fsids, id ) ) + if( id != 0 && !contains( added_fsids, id ) ) { string part_id = Partitions::ToHexString(id) + " " + Partitions::FsIdToString(id); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/include/ep-hd-lib.ycp new/yast2-storage-2.23.6/storage/src/include/ep-hd-lib.ycp --- old/yast2-storage-2.23.5/storage/src/include/ep-hd-lib.ycp 2013-01-22 12:12:36.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/include/ep-hd-lib.ycp 2013-02-15 10:33:44.000000000 +0100 @@ -219,7 +219,7 @@ } map<string, map> target_map = Storage::GetTargetMap(); - map disk = target_map[disk_device]:$[]; + map<string, any> disk = (map<string,any>) target_map[disk_device]:$[]; if (Storage::IsUsedBy(disk)) { @@ -230,7 +230,7 @@ if (disk["readonly"]:false) { - Popup::Error(Partitions::RdonlyText(disk["device"]:"", true)); + Popup::Error(Partitions::RdonlyText(disk, true)); return; } @@ -330,7 +330,7 @@ if (disk["readonly"]:false) { - Popup::Error(Partitions::RdonlyText(disk["device"]:"", true)); + Popup::Error(Partitions::RdonlyText(disk, true)); return; } @@ -376,7 +376,7 @@ if (disk["readonly"]:false) { - Popup::Error(Partitions::RdonlyText(disk["device"]:"", true)); + Popup::Error(Partitions::RdonlyText(disk, true)); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/include/ep-lib.ycp new/yast2-storage-2.23.6/storage/src/include/ep-lib.ycp --- old/yast2-storage-2.23.5/storage/src/include/ep-lib.ycp 2013-01-22 12:12:36.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/include/ep-lib.ycp 2013-02-15 10:33:44.000000000 +0100 @@ -181,7 +181,7 @@ if( disk["readonly"]:false ) { - Popup::Error( Partitions::RdonlyText( disk["device"]:"", true )); + Popup::Error(Partitions::RdonlyText(disk, true)); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/include/ep-lvm-dialogs.ycp new/yast2-storage-2.23.6/storage/src/include/ep-lvm-dialogs.ycp --- old/yast2-storage-2.23.5/storage/src/include/ep-lvm-dialogs.ycp 2013-01-22 12:12:36.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/include/ep-lvm-dialogs.ycp 2013-02-18 15:26:56.000000000 +0100 @@ -201,6 +201,24 @@ } + integer ComputePoolMetadataSize( integer siz, integer pesize ) + { + integer chunk = 64; + integer metasize = siz/chunk/(1024/64); + if( metasize<2*1024 ) + metasize = 2*1024; + while( chunk<=1048576 && metasize>128*1024 ) + { + chunk = chunk*2; + metasize = metasize/2; + } + integer pe_k = pesize/1024; + metasize = (metasize+pe_k-1)/pe_k*pe_k; + y2milestone( "ComputePoolMetadataSize size:%1 pe:%2 chunk:%3 ret:%4", + siz, pe_k, chunk, metasize ); + return( metasize ); + } + string MiniWorkflowStepVgHelptext() { // helptext @@ -411,17 +429,22 @@ integer min_size_k = data["pesize"]:0 / 1024; integer max_size_k = data["max_size_k"]:0; + boolean thin = !isempty(data["used_pool"]:""); + boolean pool = data["pool"]:false; + if( pool ) + max_size_k = max_size_k - + ComputePoolMetadataSize(data["max_size_k"]:0, + data["pesize"]:0); integer size_k = data["size_k"]:max_size_k; symbol what = (size_k == max_size_k) ? `max_size : `manual_size; string name = data["name"]:""; string max_s = sformat(_("Maximum Size (%1)"), Storage::KByteToHumanString(max_size_k)); - boolean thin = !isempty(data["used_pool"]:""); if( thin ) { what = `manual_size; max_size_k = 1024*1024*1024*1024*1024; - size_k = 900*1024; + size_k = 2*1024*1024; integer pos = search( max_s, "(" ); if( pos!=nil ) max_s = substring( max_s, 0, pos ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/include/ep-lvm-lib.ycp new/yast2-storage-2.23.6/storage/src/include/ep-lvm-lib.ycp --- old/yast2-storage-2.23.5/storage/src/include/ep-lvm-lib.ycp 2013-01-22 12:12:36.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/include/ep-lvm-lib.ycp 2013-02-18 15:26:56.000000000 +0100 @@ -226,7 +226,14 @@ data["vg_name"] = vg_name; data["pesize"] = target_map[device, "pesize"]:0; - data["max_size_k"] = (target_map[device, "pe_free"]:0 * target_map[device, "pesize"]:0) / 1024; + integer maxs = target_map[device, "pe_free"]:0 * target_map[device, "pesize"]:0 / 1024; + foreach( map p, target_map[device,"partitions"]:[], + { + if( p["create"]:false && p["pool"]:false ) + maxs = maxs - ComputePoolMetadataSize( p["size_k"]:0, + target_map[device,"pesize"]:1024 ); + }); + data["max_size_k"] = maxs; data["max_stripes"] = size(MergeDevices((map<string, any>) target_map[device]:$[])); data["using_devices"] = [ device ]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/include/raid_lib.ycp new/yast2-storage-2.23.6/storage/src/include/raid_lib.ycp --- old/yast2-storage-2.23.5/storage/src/include/raid_lib.ycp 2013-01-22 12:12:36.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/include/raid_lib.ycp 2013-02-12 19:11:37.000000000 +0100 @@ -77,7 +77,7 @@ list<symbol> allowed_ctypes = [ `CT_DISK, `CT_DMRAID, `CT_DMMULTIPATH ]; list types_no = [ `lvm, `sw_raid ]; list fsids = [ Partitions::fsid_lvm, Partitions::fsid_raid, - Partitions::fsid_native ]; + Partitions::fsid_native, Partitions::fsid_swap ]; list allowed_enc_types = [ `none ]; foreach (string dev, map devmap, targetMap, { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/inst_target_selection.ycp new/yast2-storage-2.23.6/storage/src/inst_target_selection.ycp --- old/yast2-storage-2.23.5/storage/src/inst_target_selection.ycp 2013-01-22 12:12:36.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/inst_target_selection.ycp 2013-02-15 10:33:44.000000000 +0100 @@ -247,9 +247,10 @@ } if( option!=nil && substring((string)option,0,5) == "/dev/" ) { - if( targetMap[(string)option,"readonly"]:false ) + map<string, any> disk_map = (map<string, any>) targetMap[(string) option]:$[]; + if( disk_map["readonly"]:false ) { - Popup::Error( Partitions::RdonlyText( (string)option, true )); + Popup::Error(Partitions::RdonlyText(disk_map, true)); sym = `again; } else if( Storage::IsUsedBy(targetMap[(string)option]:$[])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/modules/FileSystems.ycp new/yast2-storage-2.23.6/storage/src/modules/FileSystems.ycp --- old/yast2-storage-2.23.5/storage/src/modules/FileSystems.ycp 2013-01-22 12:12:36.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/modules/FileSystems.ycp 2013-02-12 13:46:35.000000000 +0100 @@ -956,6 +956,7 @@ `name : "Efi Boot", `fsid : Partitions::fsid_gpt_boot, `supports_format : false, + `label : "gpt", `fsid_item : "0x00 EFI Boot" ] ]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/modules/Partitions.ycp new/yast2-storage-2.23.6/storage/src/modules/Partitions.ycp --- old/yast2-storage-2.23.5/storage/src/modules/Partitions.ycp 2013-01-22 12:12:36.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/modules/Partitions.ycp 2013-02-15 10:33:44.000000000 +0100 @@ -788,13 +788,16 @@ } -global define string RdonlyText( string disk, boolean expert_partitioner ) - ``{ +global string RdonlyText(map<string, any> disk, boolean expert_partitioner) +{ string text = ""; if( expert_partitioner ) { - text = sformat( "Operation not permitted on disk %1 !\n", disk ); + text = sformat( "Operation not permitted on disk %1 !\n", disk["device"]:"" ); } + + if (!disk["has_fake_partition"]:false) + { // popup text %1 is replaced by disk name e.g. /dev/hda text = text + sformat( _(" The partitioning on your disk %1 is either not readable or not @@ -804,7 +807,22 @@ You can use the partitions on disk %1 as they are or format them and assign mount points, but you cannot add, edit, resize, or remove partitions from that disk here. -"), disk ); +"), disk["device"]:"" ); + } + else + { + // popup text %1 is replaced by disk name e.g. /dev/dasda + text = text + sformat(_(" +The disk %1 does not contain a partition table but for +compatibility the kernel has automatically generated a +partition spanning almost the entire disk. + +You can use the partition on disk %1 as it is or +format it and assign a mount point, but you cannot resize +or remove the partition from that disk here. +"), disk["device"]:""); + } + if( expert_partitioner ) { // popup text @@ -824,7 +842,6 @@ this disk during installation. "); } - return( text ); + return text; } - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/modules/Storage.ycp new/yast2-storage-2.23.6/storage/src/modules/Storage.ycp --- old/yast2-storage-2.23.5/storage/src/modules/Storage.ycp 2013-02-05 12:36:38.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/modules/Storage.ycp 2013-02-15 10:33:44.000000000 +0100 @@ -1244,6 +1244,13 @@ d["iscsi"] = true; else if( haskey( d, "iscsi" )) d = remove( d, "iscsi" ); + + bt = LibStorage::DiskInfo::swig_has_fake_partition_get(dinfo); + if( bt ) + d["has_fake_partition"] = true; + else if( haskey( d, "has_fake_partition" )) + d = remove( d, "has_fake_partition" ); + bt = LibStorage::DiskInfo::swig_initDisk_get(dinfo); if( bt ) d["dasdfmt"] = true; @@ -1791,7 +1798,7 @@ list<string> l = [ "size_k", "cyl_size", "cyl_count", "sector_size", "label", "orig_label", "name", "device", "max_logical", "max_primary", "type", "readonly", "transport", "iscsi", "used_by", "used_by_type", "used_by_device", "partitions", "dasdfmt", - "udev_id", "udev_path" ]; + "udev_id", "udev_path", "has_fake_partition" ]; foreach( string s, l, ``{ if( haskey( cinfo, s ) ) @@ -3728,15 +3735,21 @@ { case `ok: password = (string) UI::QueryWidget(`id(`pw1), `Value); - string tmp = password; - if( pw2 ) - tmp = (string) UI::QueryWidget(`id(`pw2), `Value); - if (!Storage::CheckEncryptionPasswords( password, tmp, - minpwlen, tmpcrypt)) - widget = `again; + if( pw2 ) + { + string tmp = (string) UI::QueryWidget(`id(`pw2), `Value); + if (!Storage::CheckEncryptionPasswords( password, tmp, + minpwlen, tmpcrypt)) + widget = `again; + else + ret = password; + } else + { ret = password; + } + break; } } until (widget == `cancel || widget == `ok); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.23.6/storage/src/modules/StorageProposal.ycp --- old/yast2-storage-2.23.5/storage/src/modules/StorageProposal.ycp 2013-01-22 12:12:36.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/modules/StorageProposal.ycp 2013-02-11 18:28:19.000000000 +0100 @@ -2920,8 +2920,7 @@ maplist( map p, tg[s,"partitions"]:[], ``{ if( contains( linux_pid, p["fsid"]:0 ) || - (p["fsid"]:0 == Partitions::fsid_gpt_boot) || - (p["fsid"]:0 == Partitions::FsidBoot() && + (p["fsid"]:0 == Partitions::FsidBoot() && !Partitions::EfiBoot() && p["size_k"]:0*1024 <= Partitions::MaximalBootsize()) || (Partitions::PrepBoot() && (p["fsid"]:0 == Partitions::fsid_prep_chrp_boot|| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/testsuite/data/Makefile.am new/yast2-storage-2.23.6/storage/src/testsuite/data/Makefile.am --- old/yast2-storage-2.23.5/storage/src/testsuite/data/Makefile.am 2013-01-22 12:12:36.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/testsuite/data/Makefile.am 2013-02-11 18:28:19.000000000 +0100 @@ -2,5 +2,5 @@ # Makefile.am for storage/storage/src/testsuite/data # -SUBDIRS = empty empty-efi half-empty reuse-home windows windows-only +SUBDIRS = empty empty-efi half-empty reuse-home windows windows-only windows-only-efi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/testsuite/data/Makefile.in new/yast2-storage-2.23.6/storage/src/testsuite/data/Makefile.in --- old/yast2-storage-2.23.5/storage/src/testsuite/data/Makefile.in 2013-02-07 15:12:09.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/testsuite/data/Makefile.in 2013-02-19 12:21:06.000000000 +0100 @@ -288,7 +288,7 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ -SUBDIRS = empty empty-efi half-empty reuse-home windows windows-only +SUBDIRS = empty empty-efi half-empty reuse-home windows windows-only windows-only-efi all: all-recursive .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/testsuite/data/windows-only-efi/Makefile.am new/yast2-storage-2.23.6/storage/src/testsuite/data/windows-only-efi/Makefile.am --- old/yast2-storage-2.23.5/storage/src/testsuite/data/windows-only-efi/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/testsuite/data/windows-only-efi/Makefile.am 2013-02-11 19:00:57.000000000 +0100 @@ -0,0 +1,6 @@ +# +# Makefile.am for storage/storage/src/testsuite/data/windows-only-efi +# + +EXTRA_DIST = arch.info disk_sda.info free.info + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/testsuite/data/windows-only-efi/Makefile.in new/yast2-storage-2.23.6/storage/src/testsuite/data/windows-only-efi/Makefile.in --- old/yast2-storage-2.23.5/storage/src/testsuite/data/windows-only-efi/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/testsuite/data/windows-only-efi/Makefile.in 2013-02-19 12:21:06.000000000 +0100 @@ -0,0 +1,446 @@ +# Makefile.in generated by automake 1.12.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Makefile.am for storage/storage/src/testsuite/data/windows-only-efi +# +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = storage/src/testsuite/data/windows-only-efi +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/libtool.m4 \ + $(top_srcdir)/ltoptions.m4 $(top_srcdir)/ltsugar.m4 \ + $(top_srcdir)/ltversion.m4 $(top_srcdir)/lt~obsolete.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AGENT_LIBADD = @AGENT_LIBADD@ +ALLOCA = @ALLOCA@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINTAINER = @MAINTAINER@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_CFLAGS = @PERL_CFLAGS@ +PERL_LDFLAGS = @PERL_LDFLAGS@ +PERL_VENDORARCH = @PERL_VENDORARCH@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +RPMNAME = @RPMNAME@ +SABCMD = @SABCMD@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STYLESHEET_CSS = @STYLESHEET_CSS@ +STYLESHEET_HTML = @STYLESHEET_HTML@ +STYLESHEET_PDF = @STYLESHEET_PDF@ +STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ +STYLESHEET_YDOC = @STYLESHEET_YDOC@ +SWIG = @SWIG@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ +YCPC = @YCPC@ +YCPDOC = @YCPDOC@ +YCPMAKEDEP = @YCPMAKEDEP@ +YDOXYGEN = @YDOXYGEN@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +agentdir = @agentdir@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +clientdir = @clientdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +desktopdir = @desktopdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +execcompdir = @execcompdir@ +fillupdir = @fillupdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +imagedir = @imagedir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgconfigdatadir = @pkgconfigdatadir@ +pkgconfigdir = @pkgconfigdir@ +plugindir = @plugindir@ +potdir = @potdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +schemadir = @schemadir@ +scrconfdir = @scrconfdir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +yast2dir = @yast2dir@ +ybindir = @ybindir@ +ydatadir = @ydatadir@ +yncludedir = @yncludedir@ +ystartupdir = @ystartupdir@ +EXTRA_DIST = arch.info disk_sda.info free.info +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu storage/src/testsuite/data/windows-only-efi/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu storage/src/testsuite/data/windows-only-efi/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/testsuite/data/windows-only-efi/arch.info new/yast2-storage-2.23.6/storage/src/testsuite/data/windows-only-efi/arch.info --- old/yast2-storage-2.23.5/storage/src/testsuite/data/windows-only-efi/arch.info 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/testsuite/data/windows-only-efi/arch.info 2013-02-11 18:28:19.000000000 +0100 @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<arch> + <arch>x86_64</arch> + <efiboot>true</efiboot> +</arch> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/testsuite/data/windows-only-efi/disk_sda.info new/yast2-storage-2.23.6/storage/src/testsuite/data/windows-only-efi/disk_sda.info --- old/yast2-storage-2.23.5/storage/src/testsuite/data/windows-only-efi/disk_sda.info 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/testsuite/data/windows-only-efi/disk_sda.info 2013-02-11 18:28:19.000000000 +0100 @@ -0,0 +1,57 @@ +<?xml version="1.0"?> +<disk> + <name>sda</name> + <device>/dev/sda</device> + <size_k>16777216</size_k> + <major>8</major> + <minor>0</minor> + <range>256</range> + <geometry> + <cylinders>2088</cylinders> + <heads>255</heads> + <sectors>63</sectors> + </geometry> + <label>gpt</label> + <max_primary>128</max_primary> + <udev_path>pci-0000:00:1f.2-scsi-0:0:0:0</udev_path> + <udev_id>ata-VBOX_HARDDISK_VB575dafa3-01ddf6c2</udev_id> + <udev_id>scsi-SATA_VBOX_HARDDISK_VB575dafa3-01ddf6c2</udev_id> + <transport>SATA</transport> + <partition> + <name>sda1</name> + <device>/dev/sda1</device> + <size_k>95232</size_k> + <major>8</major> + <minor>1</minor> + <numeric>true</numeric> + <number>1</number> + <fs_type>vfat</fs_type> + <fs_uuid>B4F5-583B</fs_uuid> + <mount_by>id</mount_by> + <region> + <start>0</start> + <length>12</length> + </region> + <partition_type>primary</partition_type> + <partition_id>259</partition_id> + <boot_flag>true</boot_flag> + </partition> + <partition> + <name>sda2</name> + <device>/dev/sda2</device> + <size_k>16679936</size_k> + <major>8</major> + <minor>2</minor> + <numeric>true</numeric> + <number>2</number> + <fs_type>ntfs-3g</fs_type> + <fs_uuid>607FB59D7E4F948C</fs_uuid> + <mount_by>id</mount_by> + <region> + <start>11</start> + <length>2077</length> + </region> + <partition_type>primary</partition_type> + <partition_id>7</partition_id> + </partition> +</disk> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/testsuite/data/windows-only-efi/free.info new/yast2-storage-2.23.6/storage/src/testsuite/data/windows-only-efi/free.info --- old/yast2-storage-2.23.5/storage/src/testsuite/data/windows-only-efi/free.info 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/testsuite/data/windows-only-efi/free.info 2013-02-11 18:28:19.000000000 +0100 @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<free> + <free> + <device>/dev/sda2</device> + <resize_cached>true</resize_cached> + <df_free_k>4991212</df_free_k> + <resize_free_k>14991212</resize_free_k> + <used_k>3156948</used_k> + <resize_ok>true</resize_ok> + <content_cached>true</content_cached> + <windows>true</windows> + <efi>false</efi> + <home>false</home> + </free> +</free> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/testsuite/tests/windows-only-efi1.out new/yast2-storage-2.23.6/storage/src/testsuite/tests/windows-only-efi1.out --- old/yast2-storage-2.23.5/storage/src/testsuite/tests/windows-only-efi1.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/testsuite/tests/windows-only-efi1.out 2013-02-11 18:28:19.000000000 +0100 @@ -0,0 +1,5 @@ +Dump Proposal: +Dump Shrink Windows partition /dev/sda2 to 7.78 GB [destructive] +Dump Create swap volume /dev/sda3 (517.72 MB) +Dump Create root volume /dev/sda4 (7.62 GB) with ext4 +Dump Set mount point of /dev/sda1 to /boot/efi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.23.5/storage/src/testsuite/tests/windows-only-efi1.ycp new/yast2-storage-2.23.6/storage/src/testsuite/tests/windows-only-efi1.ycp --- old/yast2-storage-2.23.5/storage/src/testsuite/tests/windows-only-efi1.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-2.23.6/storage/src/testsuite/tests/windows-only-efi1.ycp 2013-02-11 18:28:19.000000000 +0100 @@ -0,0 +1,17 @@ +// testedfiles: helper1b.yh +{ + include "./tests/setup-system.yh"; + + setup_system("windows-only-efi"); + + include "./tests/helper1a.yh"; + + import "ProductFeatures"; + + ProductFeatures::SetBooleanFeature("partitioning", "try_separate_home", true); + ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", false); + ProductFeatures::SetStringFeature("partitioning", "root_max_size", "20 GB"); + ProductFeatures::SetStringFeature("partitioning", "root_base_size", "15 GB"); + + include "./tests/helper1b.yh"; +} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org