Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at Thu Dec 24 15:45:08 CET 2009.
--------
--- yast2-storage/yast2-storage.changes 2009-12-04 11:00:34.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2009-12-22 09:51:27.000000000 +0100
@@ -1,0 +2,29 @@
+Mon Dec 21 14:17:30 CET 2009 - aschnell@suse.de
+
+- added testsuite for partitioning proposal
+- 2.19.1
+
+-------------------------------------------------------------------
+Tue Dec 15 10:42:21 CET 2009 - aschnell@suse.de
+
+- added proposal parameter "vm_keep_unpartitioned_region" (fate
+ #308490)
+
+-------------------------------------------------------------------
+Thu Dec 10 18:48:13 CET 2009 - fehr@suse.de
+
+- verify entered crypt passwords in existing crypted devices (bnc
+ #467987)
+- get rid of ClassifiedSettings in Storage.ycp
+
+-------------------------------------------------------------------
+Thu Dec 10 15:34:07 CET 2009 - fehr@suse.de
+
+- make removal of loop based files work again (bnc #480738)
+
+-------------------------------------------------------------------
+Wed Dec 09 17:44:27 CET 2009 - aschnell@suse.de
+
+- use getFreeInfo from libstorage to detect home partitions
+
+-------------------------------------------------------------------
@@ -20 +49 @@
-- disable impossible mountby methods (#444328)
+- disable impossible mountby methods (bnc #444328)
@@ -25 +54 @@
-- do not format hfs boot partition on mac systems (#447782)
+- do not format hfs boot partition on mac systems (bnc #447782)
calling whatdependson for head-i586
Old:
----
yast2-storage-2.19.0.tar.bz2
New:
----
yast2-storage-2.19.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.XdqTNe/_old 2009-12-24 15:44:44.000000000 +0100
+++ /var/tmp/diff_new_pack.XdqTNe/_new 2009-12-24 15:44:44.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.19.0)
+# spec file for package yast2-storage (Version 2.19.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,17 +19,17 @@
Name: yast2-storage
-Version: 2.19.0
-Release: 2
+Version: 2.19.1
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.19.0.tar.bz2
+Source0: yast2-storage-2.19.1.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPLv2+
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.2 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools
-BuildRequires: yast2-perl-bindings yast2-testsuite
+BuildRequires: libstorage-devel >= 2.19.3 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools
+BuildRequires: yast2-perl-bindings yast2-testsuite >= 2.19.0
Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`)
Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.18.19 yast2-libyui >= 2.18.7
Requires: yast2-dbus-client
@@ -52,7 +52,7 @@
devices during installation and on an installed system.
%prep
-%setup -n yast2-storage-2.19.0
+%setup -n yast2-storage-2.19.1
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-storage-2.19.0.tar.bz2 -> yast2-storage-2.19.1.tar.bz2 ++++++
++++ 6011 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/VERSION new/yast2-storage-2.19.1/VERSION
--- old/yast2-storage-2.19.0/VERSION 2009-10-29 11:59:13.000000000 +0100
+++ new/yast2-storage-2.19.1/VERSION 2009-12-21 14:18:28.000000000 +0100
@@ -1 +1 @@
-2.19.0
+2.19.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/configure.in new/yast2-storage-2.19.1/configure.in
--- old/yast2-storage-2.19.0/configure.in 2009-12-04 10:57:37.000000000 +0100
+++ new/yast2-storage-2.19.1/configure.in 2009-12-22 09:49:21.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.19.0, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.19.1, 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.19.0"
+VERSION="2.19.1"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
@@ -219,6 +219,13 @@
storage/src/include/Makefile
storage/src/modules/Makefile
storage/src/proposal/Makefile
+storage/src/testsuite/data/empty/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_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/Makefile.am new/yast2-storage-2.19.1/storage/src/Makefile.am
--- old/yast2-storage-2.19.0/storage/src/Makefile.am 2009-07-21 16:37:07.000000000 +0200
+++ new/yast2-storage-2.19.1/storage/src/Makefile.am 2009-12-14 19:17:08.000000000 +0100
@@ -2,7 +2,7 @@
# Makefile.am for storage/storage/src
#
-SUBDIRS = include modules proposal
+SUBDIRS = include modules proposal testsuite
client_DATA = \
inst_custom_part.ycp \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.19.1/storage/src/include/custom_part_lib.ycp
--- old/yast2-storage-2.19.0/storage/src/include/custom_part_lib.ycp 2009-11-17 10:29:54.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/include/custom_part_lib.ycp 2009-12-11 09:55:49.000000000 +0100
@@ -13,7 +13,7 @@
*
*************************************************************
*
- $Id: custom_part_lib.ycp 59576 2009-11-17 09:30:47Z aschnell $
+ $Id: custom_part_lib.ycp 60061 2009-12-10 17:50:28Z fehr $
*
*/
@@ -581,8 +581,6 @@
ret["ok"] = Storage::SetCryptPwd( dev, fs_passwd ) &&
(new["format"]:false ||
Storage::SetCrypt( dev, true, new["format"]:false ));
- if( ret["ok"]:false && new["type"]:`unknown == `loop )
- Storage::UpdateClassified( new["fpath"]:"", fs_passwd );
if( popup )
UI::CloseDialog();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/include/ep-dialogs.ycp new/yast2-storage-2.19.1/storage/src/include/ep-dialogs.ycp
--- old/yast2-storage-2.19.0/storage/src/include/ep-dialogs.ycp 2009-11-18 23:06:52.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/include/ep-dialogs.ycp 2009-12-11 09:55:49.000000000 +0100
@@ -90,15 +90,13 @@
boolean AskPassword()
{
- if (!NeedPassword())
- return false;
-
- // TODO: this is ugly
- string key = (data["type"]:`unknown != `loop) ? (data["device"]:"error") : (data["fpath"]:"error");
- if (Storage::HasClassified(key))
- return false;
-
- return true;
+ boolean ret = NeedPassword();
+ if( ret && !do_format && size(data["mount"]:"")>0 )
+ {
+ string key = (data["type"]:`unknown != `loop) ? (data["device"]:"error") : (data["fpath"]:"error");
+ ret = Storage::NeedCryptPwd(key);
+ }
+ return( ret );
}
/* MiniWorkflowStepPartitionSize data:
@@ -514,6 +512,8 @@
UI::ChangeWidget(`id(`pw1), `Value, "");
UI::ChangeWidget(`id(`pw2), `Value, "");
+ string dev = (data["type"]:`unknown != `loop) ? data["device"]:""
+ : data["fpath"]:"";
repeat
{
widget = MiniWorkflow::UserInput();
@@ -522,8 +522,11 @@
{
password = (string) UI::QueryWidget(`id(`pw1), `Value);
string tmp = (string) UI::QueryWidget(`id(`pw2), `Value);
+ boolean need_verify = !data["format"]:false &&
+ size(data["mount"]:"")>0;
- if (!Storage::CheckEncryptionPasswords(password, tmp, min_pw_len, empty_pw_allowed))
+ if (!Storage::CheckEncryptionPasswords(password, tmp, min_pw_len, empty_pw_allowed) ||
+ (need_verify && !Storage::CheckCryptOk(dev, password)) )
{
UI::SetFocus(`id(`pw1) );
widget = `again;
@@ -534,10 +537,7 @@
if (widget == `next)
{
- if (data["type"]:`unknown != `loop)
- Storage::UpdateClassified(data["device"]:"", password);
- else
- Storage::UpdateClassified(data["fpath"]:"", password);
+ Storage::SetCryptPwd(dev, password);
widget = `finish;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/modules/Makefile.am new/yast2-storage-2.19.1/storage/src/modules/Makefile.am
--- old/yast2-storage-2.19.0/storage/src/modules/Makefile.am 2009-07-31 10:42:23.000000000 +0200
+++ new/yast2-storage-2.19.1/storage/src/modules/Makefile.am 2009-12-11 14:33:33.000000000 +0100
@@ -2,10 +2,10 @@
# Makefile.am for storage/storage/src/modules
#
-YCPCFLAGS = -M ../../../bindings/ycp
+YCPCFLAGS = -M $(top_builddir)/bindings/ycp
-YCPC_LD_LIBRARY_PATH = ../../../bindings/src/.libs
-YCPC_Y2DIR = ../../../bindings/src/.libs
+YCPC_LD_LIBRARY_PATH = $(top_builddir)/bindings/src/.libs
+YCPC_Y2DIR = $(top_builddir)/bindings/src/.libs
module_DATA = \
Partitions.ycp \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/modules/Partitions.ycp new/yast2-storage-2.19.1/storage/src/modules/Partitions.ycp
--- old/yast2-storage-2.19.0/storage/src/modules/Partitions.ycp 2009-12-01 10:22:56.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/modules/Partitions.ycp 2009-12-16 13:57:55.000000000 +0100
@@ -6,7 +6,7 @@
*
* Purpose: Provides information about partitions
*
- * $Id: Partitions.ycp 58262 2009-08-03 14:58:29Z aschnell $
+ * $Id: Partitions.ycp 60122 2009-12-16 12:58:52Z aschnell $
*/
{
module "Partitions";
@@ -309,7 +309,7 @@
{
ret = true;
}
- y2milestone( "NeedBoot ret %1", ret );
+ y2milestone( "NeedBoot ret:%1", ret );
return ret;
}
@@ -334,20 +334,14 @@
return( !IsDosWinNtPartition( fsid ) && fsid==fsid_swap );
}
-global define integer SwapSizeMb( integer slot_size )
- ``{
- integer swap_size = 0;
+global integer SwapSizeMb( integer slot_size )
+ {
+ map mem_info_map = (map) SCR::Read(.proc.meminfo);
+ integer mem = mem_info_map["memtotal"]:0 / 1024;
+ y2milestone("mem_info_map:%1 mem:%2", mem_info_map, mem);
// a good approach swap == mem x 2
- integer mem = 256;
- if( !Mode::test () )
- {
- map mem_info_map = (map) SCR::Read(.proc.meminfo);
- y2milestone( "mem_info_map %1", mem_info_map );
- mem = mem_info_map["memtotal"]:0;
- mem = mem / 1024;
- }
- if( mem == 0 || mem == nil ) mem = 64;
+ integer swap_size = 0;
if( slot_size==0 )
{
@@ -424,7 +418,7 @@
y2milestone( "SwapSizeMb mem %1 slot_size %2 swap_size %3", mem,
slot_size, swap_size );
return( swap_size );
- };
+ }
global define boolean IsResizable( integer fsid )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/modules/Storage.ycp new/yast2-storage-2.19.1/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.19.0/storage/src/modules/Storage.ycp 2009-12-04 10:57:34.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/modules/Storage.ycp 2009-12-17 11:36:26.000000000 +0100
@@ -19,7 +19,7 @@
* wurde versucht "intelligent" zu gestallten und ist im einzelen bei den
* entspechenden Funktionen n�her erkl�rt.
*
- * $Id: Storage.ycp 59948 2009-12-04 09:58:26Z aschnell $
+ * $Id: Storage.ycp 60072 2009-12-11 14:43:51Z aschnell $
*/
{
module "Storage";
@@ -80,9 +80,6 @@
// end of resizing functions
-global void UpdateClassified(string key, string pwd);
-
-
map conv_ctype =
$[ "def_sym" : `CT_UNKNOWN,
"def_int" : LibStorage::CUNKNOWN(),
@@ -175,7 +172,6 @@
map DiskMapVersion = $[];
map DiskMap = $[];
-map ClassifiedSettings = $[];
map type_order = $[ `CT_DISK : 0, `CT_MD : 1, `CT_DMRAID : 2, `CT_DMMULTIPATH : 3,
`CT_LOOP : 4, `CT_DM : 5, `CT_LVM : 6, `CT_NFS : 7 ];
list<string> hw_packages = [];
@@ -243,7 +239,7 @@
{
any env = LibStorage::Environment::new("LibStorage::Environment", readonly);
LibStorage::Environment::swig_testmode_set(env, Mode::test());
- LibStorage::Environment::swig_autodetect_set(env, true);
+ LibStorage::Environment::swig_autodetect_set(env, !Mode::test());
LibStorage::Environment::swig_instsys_set(env, Mode::installation() || Mode::repair());
integer locker_pid = 0;
@@ -734,6 +730,12 @@
``(p["device"]:""==device ));
pa = part[0]:$[];
}
+ if( size(pa)==0 && search(device, "/dev/mapper/")==0 )
+ {
+ part = filter( map p, tg["/dev/loop","partitions"]:[],
+ ``(p["device"]:""==device ));
+ pa = part[0]:$[];
+ }
if( size(pa)>0 )
ret = add( ret, pa );
});
@@ -793,28 +795,19 @@
* @param symbol used_fs
* @param boolean verbose
*/
-global define map GetFreeSpace( string device, integer testsize,
- symbol used_fs, boolean verbose )
- ``{
- if( Mode::test() )
- {
- integer wf = tointeger(tofloat(testsize) * 0.6);
- integer wu = tointeger(tofloat(testsize) * 0.4);
- integer ls = tointeger(tofloat(testsize) * 0.5);
- return( $[ "free" : wf, "used" : wu,
- "linux_size" : ls, "new_size": (wu + wf - ls) ] );
- }
-
+global map GetFreeSpace(string device, integer testsize, symbol used_fs, boolean verbose)
+{
integer used = 0;
integer resize_free = 0;
integer df_free = 0;
boolean win_disk = false;
boolean efi = false;
+ boolean home = false;
boolean r = false;
r = LibStorage::StorageInterface::getFreeInfo( sint, device, resize_free,
df_free, used, win_disk,
- efi, used_fs==`ntfs );
+ efi, home, used_fs==`ntfs );
resize_free = resize_free * 1024; // Byte
df_free = df_free * 1024; // Byte
@@ -904,8 +897,8 @@
"new_size":new_size ];
ret["ok"] = r;
y2milestone( "GetFreeSpace %1 ret %2", device, ret );
- return( ret );
- };
+ return ret;
+}
global integer GetUnusedPartitionSlots(string device, list<map> &slots)
@@ -945,8 +938,8 @@
* @param map target
* @return map target
*/
-global define map AddMountPointInfo( map target )
- ``{
+global map AddMountPointInfo( map target )
+ {
list<map> mounts = Partitions::CurMounted();
foreach(string diskdev, map disk, target,
``{
@@ -1485,7 +1478,7 @@
p["fstype"] = Partitions::loop_name;
p["fpath"] = LibStorage::LoopInfo::swig_file_get(info);
p["create_file"] = !LibStorage::LoopInfo::swig_reuseFile_get(info);
- if( p["enc_type"]:`unknown != `luks )
+ if( p["enc_type"]:`unknown != `luks && size(p["loop"]:"")>0 )
p["device"] = p["loop"]:"";
c["partitions"] = add( c["partitions"]:[], p );
});
@@ -2318,21 +2311,6 @@
else
y2milestone( "ChangeVolumeProperties sint ret:%1", ret );
}
- if( ret==0 &&
- part["enc_type"]:`none != `none && haskey( ClassifiedSettings, dev ) )
- {
- changed = true;
- if( size(ClassifiedSettings[dev]:"")>0 )
- {
- string pwd = ClassifiedSettings[dev]:"";
- ret = LibStorage::StorageInterface::setCryptPassword( sint, dev,
- pwd );
- if( ret<0 )
- y2error( "ChangeVolumeProperties sint ret:%1", ret );
- else
- y2milestone( "ChangeVolumeProperties sint ret:%1", ret );
- }
- }
if( ret==0 && part["enc_type"]:`none != curr["enc_type"]:`none )
{
changed = true;
@@ -2677,42 +2655,61 @@
return ret;
}
+global string GetCryptPwd( string device )
+ {
+ string pwd="";
+ y2milestone( "GetCryptPwd device:%1", device );
+ integer ret = 0;
+ ret = LibStorage::StorageInterface::getCryptPassword( sint, device,
+ pwd );
+ if( ret<0 )
+ y2error( "GetCryptPwd sint ret:%1", ret );
+ else
+ y2milestone( "GetCryptPwd empty:%1", size(pwd)==0 );
+ return( pwd );
+ }
+
+global boolean SetCryptPwd( string device, string pwd )
+ {
+ y2milestone( "SetCryptPwd device:%1", device );
+ integer ret = 0;
+ ret = LibStorage::StorageInterface::setCryptPassword( sint, device,
+ pwd );
+ if( ret<0 )
+ y2error( "SetCryptPwd sint ret:%1", ret );
+ else
+ y2milestone( "SetCryptPwd sint ret:%1", ret );
+ return( ret==0 );
+ }
+
+global boolean NeedCryptPwd( string device )
+ {
+ boolean ret = false;
+ ret = LibStorage::StorageInterface::needCryptPassword( sint, device );
+ y2milestone( "NeedCryptPwd device:%1 ret:%2", device, ret );
+ return( ret );
+ }
+
+
global string CreateLoop( string file, boolean create, integer sizeK,
string mp )
{
y2milestone( "CreateLoop file:%1 create:%2 sizeK:%3 mp:%4", file, create,
sizeK, mp );
string dev = "";
- integer ret = -9999;
- if( haskey( ClassifiedSettings, file ))
- {
- string pwd = ClassifiedSettings[file]:"";
- ret = LibStorage::StorageInterface::createFileLoop( sint, file, !create,
- sizeK, mp, pwd,
- dev );
- UpdateClassified(dev, pwd);
- }
+ integer ret = 0;
+ string pwd = GetCryptPwd( file );
+ ret = LibStorage::StorageInterface::createFileLoop( sint, file, !create,
+ sizeK, mp, pwd, dev );
if( ret<0 )
y2error( "CreateLoop sint ret:%1", ret );
+ LibStorage::StorageInterface::forgetCryptPassword( sint, file );
UpdateTargetMapDisk( "/dev/loop" );
y2milestone( "CreateLoop dev:%1", dev );
return( dev );
}
-global void UpdateClassified( string key, string pwd )
- {
- ClassifiedSettings[key] = pwd;
- //y2milestone( "ClassifiedSettings %1", ClassifiedSettings );
- }
-
-
-global boolean HasClassified(string key)
-{
- return haskey(ClassifiedSettings, key);
-}
-
-
define void HandleModulesOnBoot( map targetMap );
global boolean UpdateLoop( string dev, string file, boolean create,
@@ -2742,42 +2739,6 @@
return( ret==0 );
}
-global string GetCryptPwd( string device )
- {
- string pwd="";
- y2milestone( "GetCryptPwd device:%1", device );
- if( size(ClassifiedSettings[device]:"")>0 )
- pwd = ClassifiedSettings[device]:"";
- else
- {
- integer ret = 0;
- ret = LibStorage::StorageInterface::getCryptPassword( sint, device,
- pwd );
- if( ret<0 )
- y2error( "GetCryptPwd sint ret:%1", ret );
- }
- y2milestone( "GetCryptPwd empty:%1", size(pwd)==0 );
- return( pwd );
- }
-
-global boolean SetCryptPwd( string device, string pwd )
- {
- y2milestone( "SetCryptPwd device:%1", device );
- integer ret = LibStorage::StorageInterface::setCryptPassword( sint, device,
- pwd );
- y2milestone( "SetCryptPwd sint ret:%1", ret );
- map p = GetPartition( GetTargetMap(), device );
- if( ret==LibStorage::STORAGE_VOLUME_NOT_FOUND() || p["create"]:false )
- {
- ClassifiedSettings[device] = pwd;
- y2milestone( "setting classified %1 pwd size %2", device, size(pwd) );
- ret = 0;
- }
- else if( ret<0 )
- y2error( "SetCryptPwd sint ret:%1", ret );
- return( ret==0 );
- }
-
global string DefaultDiskLabel(integer size_k)
{
@@ -2926,16 +2887,14 @@
* @parm primary handle primary or logical partitions
* @return list new partitions with windows mountpoints
*/
-define void AddMountPointsForWinParts( list<map> partitions, boolean primary,
- integer max_prim, integer& foreign_nr )
- ``{
+void AddMountPointsForWinParts( list<map> partitions, boolean primary,
+ integer max_prim, integer& foreign_nr )
+ {
if( !Arch::i386 () && !Arch::ia64 () && !Arch::x86_64 () )
return;
string foreign_ids = "CDEFGHIJKLMNOPQRSTUVW";
- list<map> new_partitions = [];
-
foreach(map partition, partitions,
``{
map new_partition = partition;
@@ -2976,8 +2935,8 @@
};
-global define void AddMountPointsForWin( map targets )
- ``{
+global void AddMountPointsForWin( map targets )
+ {
y2milestone( "AddMountPointsForWin called" );
integer foreign_nr = 0;
@@ -3011,13 +2970,16 @@
LibStorage::StorageInterface::removeDmTableTo( sint, device );
}
-global define boolean CheckSwapable( string dev )
+global boolean CheckSwapable( string dev )
{
- string cmd = "swapon " + dev;
+ if (Mode::test())
+ return true;
+
+ string cmd = "/sbin/swapon --fixpgsz " + dev;
boolean ok = (integer)SCR::Execute(.target.bash, cmd )==0;
if( ok )
{
- cmd = "swapoff " + dev;
+ cmd = "/sbin/swapoff " + dev;
SCR::Execute(.target.bash, cmd );
}
y2milestone( "CheckSwapable dev:%1 ret:%2", dev, ok );
@@ -3029,9 +2991,9 @@
* @param target Disk map
* @return map modified target
*/
-global define map AddSwapMp( map target )
- ``{
- list swaps = SwappingPartitions();
+global map AddSwapMp( map target )
+ {
+ list<string> swaps = SwappingPartitions();
y2milestone( "AddSwapMp swaps %1", swaps );
foreach(string diskdev, map disk, target,
``{
@@ -3061,7 +3023,7 @@
});
target[diskdev] = disk;
});
- return( target );
+ return target;
}
@@ -3082,12 +3044,25 @@
map tmp = $[];
boolean changed = false;
- if( !probe_done && !Mode::config() )
+
+ if (Mode::test())
+ {
+ foreach(map c, conts, {
+ tmp[c["device"]:""] = getContainerInfo(c);
+ });
+ StorageMap[targets_key] = tmp;
+ if (!probe_done)
+ {
+ probe_done = true;
+ changed = true;
+ }
+ }
+ else if( !probe_done && !Mode::config() )
{
map bios_id_raid = $[];
y2milestone ("probing StorageDevices" );
map rename = $[];
- tmp = (map)StorageDevices::Probe(true);
+ tmp = StorageDevices::Probe(true);
foreach( string dev, map disk, tmp,
``{
map dtmp = Storage::GetDiskPartitionTg( dev, $[] )[0]:$[];
@@ -3391,7 +3366,6 @@
integer ret = LibStorage::StorageInterface::commit( sint );
if( ret<0 )
y2error( "CommitChanges sint ret:%1", ret );
- ClassifiedSettings = $[];
return( ret );
}
@@ -3451,57 +3425,33 @@
return( MountOpt( dev, mp, "" ) );
}
-global define map DetectHomeFs( map p )
+
+boolean DetectHomeFs( map p )
{
y2milestone( "DetectHomeFs p:%1", p );
- map ret = $[];
- boolean home = false;
- list poss_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs, `jfs ];
+ boolean ret = false;
+ list<symbol> poss_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs, `jfs ];
+ string device = p["device"]:"";
if( !p["created"]:false && contains( poss_fs, p["detected_fs"]:`unknown ) &&
- size(p["device"]:"")>0 )
- {
- boolean mount_ok = false;
- string tmpdir = (string) SCR::Read(.target.tmpdir) + "/tmp-home-mp";
- SCR::Execute(.target.mkdir, tmpdir );
- string fsto = FileSystems::DefaultFstabOptions( p );
- mount_ok = Storage::MountOpt( p["device"]:"", tmpdir, fsto );
- if( !mount_ok )
- mount_ok = Storage::Mount( p["device"]:"", tmpdir );
- else
- ret["fstopt"] = fsto;
- if( mount_ok )
- {
- list skip = [ ".", "..", "root" ];
- list tfile = [ ".profile", ".ssh", ".bashrc", ".kde2", ".gnome2", ".kde", ".gnome" ];
- list<string> files = (list<string>)SCR::Read (.target.dir, tmpdir);
- y2milestone( "DetectHomeFs files:%1", files );
- integer count=0;
-
- while( !home && count0;
- i = i+1;
- }
- }
- count = count+1;
- }
- Storage::Umount( p["device"]:"" );
- }
- SCR::Execute( .target.bash, "rmdir " + tmpdir );
- }
- ret["ishome"] = home;
- y2milestone( "DetectHomeFs ret:%1", ret );
- return( ret );
+ !isempty(device) )
+ {
+ integer used = 0;
+ integer resize_free = 0;
+ integer df_free = 0;
+ boolean win_disk = false;
+ boolean efi = false;
+ boolean home = false;
+
+ if (LibStorage::StorageInterface::getFreeInfo(sint, device, resize_free,
+ df_free, used, win_disk,
+ efi, home, true))
+ ret = home;
+ }
+ y2milestone("DetectHomeFs device:%1 ret:%2", device, ret);
+ return ret;
}
+
global define map SetVolOptions( map p, string mnt, symbol fs, string fs_opts,
string fstab_opts, string label )
{
@@ -3531,14 +3481,13 @@
ret["detected_fs"]:`unknown != `unknown && mnt=="/home" )
{
boolean lvm = p["type"]:`primary == `lvm;
- map h = DetectHomeFs( ret );
if( ( lvm && ret["name"]:""=="home") ||
- (!lvm && h["ishome"]:false ) )
+ (!lvm && DetectHomeFs(ret)))
{
ret["format"] = false;
ret["used_fs"] = ret["detected_fs"]:`unknown;
- if( size(fstab_opts)==0 )
- fstab_opts = h["fstopt"]:"";
+ if (isempty(fstab_opts))
+ fstab_opts = FileSystems::DefaultFstabOptions(ret);
}
}
if( ret["format"]:false && !ret["create"]:false &&
@@ -4009,25 +3958,20 @@
return( ret );
}
+
/**
* Check if swap paritition is availbe on a disk
* @param disk Disk to be checked
* @return boolean true if swap available.
*/
-global define boolean CheckSwapOn( string disk )``{
- boolean ret = false;
- list swaps = SwappingPartitions();
- while( size(swaps)>0 && !ret )
- {
- if( search( swaps[0]:"", disk )==0)
- {
- ret = true;
- }
- swaps = remove( swaps, 0 );
- }
- y2milestone( "CheckSwapOn %1 ret %2", disk, ret );
- return( ret );
- }
+global boolean CheckSwapOn(string disk)
+{
+ list<string> swaps = SwappingPartitions();
+ boolean ret = contains(SwappingPartitions(), disk);
+ y2milestone("CheckSwapOn disk:%1 ret:%2", disk, ret);
+ return ret;
+}
+
/**
* Returns list of primary partitions found
@@ -5365,4 +5309,18 @@
return true;
}
+global boolean CheckCryptOk( string dev, string fs_passwd )
+ {
+ integer i = LibStorage::StorageInterface::verifyCryptPassword( sint, dev, fs_passwd );
+ if( i!=0 )
+ Popup::Error( sformat(_("Could not set encryption.
+System error code is %1.
+
+The crypt password provided could be incorrect.
+"), i ));
+ y2milestone( "CheckCryptOk dev:%1 pwlen:%2 ret:%3",
+ dev, size(fs_passwd), i==0 );
+ return( i==0 );
+ }
+
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/modules/StorageDevices.ycp new/yast2-storage-2.19.1/storage/src/modules/StorageDevices.ycp
--- old/yast2-storage-2.19.0/storage/src/modules/StorageDevices.ycp 2009-11-14 01:50:36.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/modules/StorageDevices.ycp 2009-12-07 15:34:25.000000000 +0100
@@ -14,7 +14,7 @@
* - removable drives (ZIP)
* - floppy devices
*
- * $Id: StorageDevices.ycp 56833 2009-04-17 14:59:40Z aschnell $
+ * $Id: StorageDevices.ycp 59976 2009-12-07 11:59:17Z aschnell $
*
* Author:
* Klaus Kaempf (initial)
@@ -374,19 +374,20 @@
* @return map TargetMap
*/
-global define map fakeProbe ()
- ``{
+map fakeProbe()
+ {
string fake_map_file = ( Mode::test () ? "demo_target_map.ycp" : "test_target_map.ycp" );
y2milestone( "%1 mode - using fake target map from %2",
Mode::test () ? "Demo" : "Test", fake_map_file );
- map target_map = (map) SCR::Read( .target.yast2, fake_map_file );
+ map target_map = (map) SCR::Read( .target.yast2, fake_map_file );
y2debug( "Fake target map: %1", target_map );
return target_map;
- } // fakeProbe()
+ }
+
global boolean FloppyPresent()
{
@@ -416,8 +417,8 @@
* @return map TargetMap
*/
-define map localProbe()
- ``{
+map localProbe()
+ {
map targets = $[];
if( Mode::test () )
{
@@ -433,7 +434,7 @@
{
// somehow, we couldn't find any harddisks for installation.
// This is a fatal error, we can't do anything about it
- return targets;
+ return (map) targets;
}
// loop over all_disks, constructing targets map
@@ -614,7 +615,7 @@
y2milestone( "localProbe: FloppyDrives %1", FloppyDrives() );
y2milestone( "localProbe: ZipDrives %1", ZipDrives() );
- return targets;
+ return (map) targets;
}
/*
@@ -625,16 +626,16 @@
* @param boolean force_reset
*/
-global define map Probe(boolean force_reset)
- ``{
- map target = $[];
+global map Probe(boolean force_reset)
+ {
+ map target = $[];
y2milestone( "Probe force_reset:%1 disks_valid:%2", force_reset, disks_valid );
if( force_reset )
targetMapSize = 0;
if( targetMapSize==0 && disks_valid )
{
- target = localProbe();
+ target = (map) localProbe();
targetMapSize = size(target);
ProbeCDROMs();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.19.1/storage/src/modules/StorageProposal.ycp
--- old/yast2-storage-2.19.0/storage/src/modules/StorageProposal.ycp 2009-11-16 14:13:22.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/modules/StorageProposal.ycp 2009-12-15 11:28:37.000000000 +0100
@@ -117,7 +117,7 @@
if (isempty(cfg_xml))
{
boolean btmp = ProductFeatures::GetBooleanFeature("partitioning", "try_separate_home");
- cfg_xml["home"] = btmp ? true : false;
+ cfg_xml["home"] = btmp;
integer itmp = ProductFeatures::GetIntegerFeature("partitioning", "root_space_percent");
cfg_xml["root_percent"] = itmp;
@@ -139,6 +139,9 @@
if (cfg_xml["root_max"]:0 <= 0)
cfg_xml["root_max"] = 10*1024;
+ btmp = ProductFeatures::GetBooleanFeature("partitioning", "vm_keep_unpartitioned_region");
+ cfg_xml["vm_keep_unpartitioned_region"] = btmp;
+
stmp = ProductFeatures::GetStringFeature("partitioning", "vm_desired_size");
cfg_xml["vm_want"] = Storage::ClassicStringToByte(stmp) / (1024*1024);
if (cfg_xml["vm_want"]:0 <= 0)
@@ -191,7 +194,7 @@
{
y2debug("setting encryption for %1", part_device);
partition["enc_type"] = `luks;
- Storage::UpdateClassified(part_device, proposal_password);
+ Storage::SetCryptPwd(part_device, proposal_password);
}
return partition;
});
@@ -343,7 +346,7 @@
global void flex_init_swapable(map tg)
{
swapable = $[];
- list swaps = Storage::SwappingPartitions();
+ list<string> swaps = Storage::SwappingPartitions();
foreach(string dev, map disk, tg, {
if (disk["used_by_type"]:`UB_NONE == `UB_NONE)
{
@@ -576,7 +579,7 @@
// space left (fate #303594)
y2milestone ("do_vm_disk_conf maximum volume group size from control file: %1", vg_size);
integer add_cylinders = g["cylinders"]:0; // whole partition as default
- if (vg_size != nil && vg_size > 0)
+ if (vg_size != nil && vg_size > 0 && GetControlCfg()["vm_keep_unpartitioned_region"]:false)
{
integer cyl_size = g["size"]:0 / g["cylinders"]:0;
add_cylinders = (vg_size * 1024 * 1024) / cyl_size;
@@ -715,7 +718,7 @@
integer vg_size = GetControlCfg()["vm_want"]:(15*1024);
y2milestone ("do_vm_disk_conf maximum volume group size from control file: %1", vg_size);
integer add_cylinders = g["cylinders"]:0; // whole partition as default
- if (vg_size != nil && vg_size > 0)
+ if (vg_size != nil && vg_size > 0 && GetControlCfg()["vm_keep_unpartitioned_region"]:false)
{
integer cyl_size = g["size"]:0 / g["cylinders"]:0;
add_cylinders = (vg_size * 1024 * 1024) / cyl_size;
@@ -2497,10 +2500,10 @@
integer max_prim, list<map> partitions )
{
list<map> ret = [];
- y2milestone( "can_boot_reuse boot %1", boot );
+ y2milestone( "can_boot_reuse boot:%1", boot );
if( boot && !Partitions::PrepBoot() )
{
- y2milestone( "can_boot_reuse disk %1 max_prim %2 label %3 part %4",
+ y2milestone( "can_boot_reuse disk:%1 max_prim:%2 label:%3 part:%4",
disk, max_prim, label, partitions );
list<map> pl = [];
pl = filter( map p, partitions,
@@ -2531,7 +2534,7 @@
return( p );
});
}
- y2milestone( "can_boot_reuse ret %1", ret );
+ y2milestone( "can_boot_reuse ret:%1", ret );
}
return( ret );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/Makefile.am new/yast2-storage-2.19.1/storage/src/testsuite/Makefile.am
--- old/yast2-storage-2.19.0/storage/src/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/Makefile.am 2009-12-21 12:11:59.000000000 +0100
@@ -0,0 +1,31 @@
+#
+# Makefile.am for .../testsuite
+#
+# Do not edit this file (Makefile.am) as it will be overwritten!
+#
+
+SUBDIRS = data
+
+AUTOMAKE_OPTIONS = dejagnu
+EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh)
+
+Y2BASEFLAGS = -M $(top_builddir)/bindings/ycp
+export Y2BASEFLAGS
+
+Y2BASE_LD_LIBRARY_PATH = $(top_builddir)/bindings/src/.libs
+Y2BASE_Y2DIR = $(top_builddir)/bindings/src/.libs
+export Y2BASE_LD_LIBRARY_PATH
+export Y2BASE_Y2DIR
+
+testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite
+
+all-local: $(testsuite_prepare)
+ make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir)
+
+clean-local: $(testsuite_prepare)
+ make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean
+
+check-local: $(testsuite_prepare)
+ make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check
+
+# EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/README new/yast2-storage-2.19.1/storage/src/testsuite/README
--- old/yast2-storage-2.19.0/storage/src/testsuite/README 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/README 2009-12-10 15:08:26.000000000 +0100
@@ -0,0 +1,5 @@
+
+To run a test-script manually:
+
+ /usr/lib/YaST2/bin/y2base ./tests/<name>.ycp UI
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/Makefile.am new/yast2-storage-2.19.1/storage/src/testsuite/data/Makefile.am
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/Makefile.am 2009-12-11 10:18:35.000000000 +0100
@@ -0,0 +1,6 @@
+#
+# Makefile.am for storage/storage/src/testsuite/data
+#
+
+SUBDIRS = empty half-empty reuse-home windows windows-only
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/empty/Makefile.am new/yast2-storage-2.19.1/storage/src/testsuite/data/empty/Makefile.am
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/empty/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/empty/Makefile.am 2009-12-11 10:56:31.000000000 +0100
@@ -0,0 +1,6 @@
+#
+# Makefile.am for storage/storage/src/testsuite/data/empty
+#
+
+EXTRA_DIST = disk_sda.info
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/empty/disk_sda.info new/yast2-storage-2.19.1/storage/src/testsuite/data/empty/disk_sda.info
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/empty/disk_sda.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/empty/disk_sda.info 2009-12-16 14:50:35.000000000 +0100
@@ -0,0 +1,16 @@
+Name: sda
+Device: /dev/sda
+UdevPath: pci-0000:00:1f.2-scsi-0:0:0:0
+UdevId: ata-ST3320620AS_6QF4HR0L
+UdevId: scsi-SATA_ST3320620AS_6QF4HR0L
+Major: 8
+Minor: 0
+Range: 256
+Cylinder: 38913
+Head: 255
+Sector: 63
+Label: msdos
+MaxPrimary: 4
+ExtPossible: 1
+MaxLogical: 63
+SizeK: 312571224
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/half-empty/Makefile.am new/yast2-storage-2.19.1/storage/src/testsuite/data/half-empty/Makefile.am
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/half-empty/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/half-empty/Makefile.am 2009-12-11 10:56:28.000000000 +0100
@@ -0,0 +1,6 @@
+#
+# Makefile.am for storage/storage/src/testsuite/data/half-empty
+#
+
+EXTRA_DIST = disk_sda.info
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/half-empty/disk_sda.info new/yast2-storage-2.19.1/storage/src/testsuite/data/half-empty/disk_sda.info
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/half-empty/disk_sda.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/half-empty/disk_sda.info 2009-12-11 10:54:53.000000000 +0100
@@ -0,0 +1,18 @@
+Name: sda
+Device: /dev/sda
+UdevPath: pci-0000:00:1f.2-scsi-0:0:0:0
+UdevId: ata-ST3320620AS_6QF4HR0L
+UdevId: scsi-SATA_ST3320620AS_6QF4HR0L
+Major: 8
+Minor: 0
+Range: 256
+Cylinder: 38913
+Head: 255
+Sector: 63
+Label: msdos
+MaxPrimary: 4
+ExtPossible: 1
+MaxLogical: 63
+SizeK: 312571224
+Partition: 1 /dev/sda1 1044225 8 1 1 130 83 primary boot
+Partition: 2 /dev/sda2 157284382 8 2 131 19581 8e primary
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/reuse-home/Makefile.am new/yast2-storage-2.19.1/storage/src/testsuite/data/reuse-home/Makefile.am
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/reuse-home/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/reuse-home/Makefile.am 2009-12-11 10:56:24.000000000 +0100
@@ -0,0 +1,6 @@
+#
+# Makefile.am for storage/storage/src/testsuite/data/reuse-home
+#
+
+EXTRA_DIST = disk_sda.info free.info volume.info
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/reuse-home/disk_sda.info new/yast2-storage-2.19.1/storage/src/testsuite/data/reuse-home/disk_sda.info
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/reuse-home/disk_sda.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/reuse-home/disk_sda.info 2009-12-11 10:55:00.000000000 +0100
@@ -0,0 +1,19 @@
+Name: sda
+Device: /dev/sda
+UdevPath: pci-0000:00:1f.2-scsi-0:0:0:0
+UdevId: ata-ST3320620AS_6QF4HR0L
+UdevId: scsi-SATA_ST3320620AS_6QF4HR0L
+Major: 8
+Minor: 0
+Range: 256
+Cylinder: 38913
+Head: 255
+Sector: 63
+Label: msdos
+MaxPrimary: 4
+ExtPossible: 1
+MaxLogical: 63
+SizeK: 312571224
+Partition: 1 /dev/sda1 2104515 0 0 0 262 82 primary
+Partition: 2 /dev/sda2 15735667 0 0 262 1959 83 primary
+Partition: 3 /dev/sda3 294728490 0 0 2221 36692 83 primary
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/reuse-home/free.info new/yast2-storage-2.19.1/storage/src/testsuite/data/reuse-home/free.info
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/reuse-home/free.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/reuse-home/free.info 2009-12-11 10:55:10.000000000 +0100
@@ -0,0 +1 @@
+/dev/sda3 df_free=23338740 resize_free=23338740 used=26203196 windows=0 efi=0 home=1 resize_ok=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/reuse-home/volume.info new/yast2-storage-2.19.1/storage/src/testsuite/data/reuse-home/volume.info
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/reuse-home/volume.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/reuse-home/volume.info 2009-12-11 10:55:18.000000000 +0100
@@ -0,0 +1,3 @@
+/dev/sda1 fs=swap size=2104515
+/dev/sda2 fs=ext4 size=15735667
+/dev/sda3 fs=ext4 size=294728490
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/windows/Makefile.am new/yast2-storage-2.19.1/storage/src/testsuite/data/windows/Makefile.am
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/windows/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/windows/Makefile.am 2009-12-11 10:56:15.000000000 +0100
@@ -0,0 +1,6 @@
+#
+# Makefile.am for storage/storage/src/testsuite/data/windows
+#
+
+EXTRA_DIST = disk_sda.info free.info volume.info
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/windows/disk_sda.info new/yast2-storage-2.19.1/storage/src/testsuite/data/windows/disk_sda.info
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/windows/disk_sda.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/windows/disk_sda.info 2009-12-11 10:55:31.000000000 +0100
@@ -0,0 +1,16 @@
+Name: sda
+Device: /dev/sda
+UdevPath: pci-0000:00:1f.2-scsi-1:0:0:0
+UdevId: ata-INTEL_SSDSA2MH080G1GC_CVEM924200GV080DGN
+Major: 8
+Minor: 16
+Range: 256
+Cylinder: 9729
+Head: 255
+Sector: 63
+Label: msdos
+MaxPrimary: 4
+ExtPossible: 1
+MaxLogical: 63
+SizeK: 78150744
+Partition: 1 /dev/sda1 41945715 8 17 0 5223 7 primary
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/windows/free.info new/yast2-storage-2.19.1/storage/src/testsuite/data/windows/free.info
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/windows/free.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/windows/free.info 2009-12-11 10:55:28.000000000 +0100
@@ -0,0 +1 @@
+/dev/sda1 df_free=27806796 resize_free=27806796 used=13155812 windows=1 efi=0 home=0 resize_ok=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/windows/volume.info new/yast2-storage-2.19.1/storage/src/testsuite/data/windows/volume.info
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/windows/volume.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/windows/volume.info 2009-12-11 10:55:25.000000000 +0100
@@ -0,0 +1 @@
+/dev/sda1 fs=ntfs-3g size=41945715 uuid=33458CDC339D406E
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/windows-only/Makefile.am new/yast2-storage-2.19.1/storage/src/testsuite/data/windows-only/Makefile.am
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/windows-only/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/windows-only/Makefile.am 2009-12-11 10:56:07.000000000 +0100
@@ -0,0 +1,6 @@
+#
+# Makefile.am for storage/storage/src/testsuite/data/windows-only
+#
+
+EXTRA_DIST = disk_sda.info free.info volume.info
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/windows-only/disk_sda.info new/yast2-storage-2.19.1/storage/src/testsuite/data/windows-only/disk_sda.info
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/windows-only/disk_sda.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/windows-only/disk_sda.info 2009-12-11 10:55:36.000000000 +0100
@@ -0,0 +1,16 @@
+Name: sda
+Device: /dev/sda
+UdevPath: pci-0000:00:1f.2-scsi-1:0:0:0
+UdevId: ata-INTEL_SSDSA2MH080G1GC_CVEM924200GV080DGN
+Major: 8
+Minor: 16
+Range: 256
+Cylinder: 9729
+Head: 255
+Sector: 63
+Label: msdos
+MaxPrimary: 4
+ExtPossible: 1
+MaxLogical: 63
+SizeK: 78150744
+Partition: 1 /dev/sda1 78148161 8 17 0 9729 7 primary
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/windows-only/free.info new/yast2-storage-2.19.1/storage/src/testsuite/data/windows-only/free.info
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/windows-only/free.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/windows-only/free.info 2009-12-11 10:55:38.000000000 +0100
@@ -0,0 +1 @@
+/dev/sda1 df_free=64991212 resize_free=64991212 used=13156948 windows=1 efi=0 home=0 resize_ok=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/data/windows-only/volume.info new/yast2-storage-2.19.1/storage/src/testsuite/data/windows-only/volume.info
--- old/yast2-storage-2.19.0/storage/src/testsuite/data/windows-only/volume.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/data/windows-only/volume.info 2009-12-11 10:55:41.000000000 +0100
@@ -0,0 +1 @@
+/dev/sda1 fs=ntfs-3g size=78148161 uuid=33458CDC339D406E
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty1.out new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty1.out
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty1.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty1.out 2009-12-17 16:05:22.000000000 +0100
@@ -0,0 +1,3 @@
+Dump Proposal:
+Dump Create swap partition /dev/sda1 (517.72 MB)
+Dump Create root partition /dev/sda2 (297.58 GB) with ext4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty1.ycp new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty1.ycp
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty1.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty1.ycp 2009-12-18 14:39:39.000000000 +0100
@@ -0,0 +1,17 @@
+// testedfiles: helper1b.yh
+{
+ include "./tests/setup-system.yh";
+
+ setup_system("empty");
+
+ include "./tests/helper1a.yh";
+
+ import "ProductFeatures";
+
+ ProductFeatures::SetBooleanFeature("partitioning", "try_separate_home", false);
+ ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", false);
+ ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB");
+ ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB");
+
+ include "./tests/helper1b.yh";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty2.out new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty2.out
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty2.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty2.out 2009-12-17 16:06:52.000000000 +0100
@@ -0,0 +1,4 @@
+Dump Proposal:
+Dump Create swap partition /dev/sda1 (2.01 GB)
+Dump Create root partition /dev/sda2 (20.00 GB) with ext4
+Dump Create partition /dev/sda3 (276.08 GB) for /home with ext4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty2.ycp new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty2.ycp
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty2.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty2.ycp 2009-12-18 14:39:39.000000000 +0100
@@ -0,0 +1,17 @@
+// testedfiles: helper1b.yh
+{
+ include "./tests/setup-system.yh";
+
+ setup_system("empty");
+
+ include "./tests/helper1a.yh";
+
+ import "ProductFeatures";
+
+ ProductFeatures::SetBooleanFeature("partitioning", "try_separate_home", true);
+ ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", false);
+ ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB");
+ ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB");
+
+ include "./tests/helper1b.yh";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty3.out new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty3.out
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty3.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty3.out 2009-12-17 16:06:52.000000000 +0100
@@ -0,0 +1,6 @@
+Dump Proposal:
+Dump Create boot partition /dev/sda1 (70.60 MB) with ext4
+Dump Create partition /dev/sda2 (29.99 GB) with id=8E
+Dump Create volume group system from /dev/sda2 [destructive]
+Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4
+Dump Create swap logical volume /dev/system/swap (512.00 MB)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty3.ycp new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty3.ycp
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty3.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty3.ycp 2009-12-18 14:39:39.000000000 +0100
@@ -0,0 +1,18 @@
+// testedfiles: helper1b.yh
+{
+ include "./tests/setup-system.yh";
+
+ setup_system("empty");
+
+ include "./tests/helper1a.yh";
+
+ import "ProductFeatures";
+
+ ProductFeatures::SetBooleanFeature("partitioning", "try_separate_home", false);
+ ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", true);
+ ProductFeatures::SetBooleanFeature("partitioning", "vm_keep_unpartitioned_region", true);
+ ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB");
+ ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB");
+
+ include "./tests/helper1b.yh";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty4.out new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty4.out
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty4.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty4.out 2009-12-17 16:06:52.000000000 +0100
@@ -0,0 +1,7 @@
+Dump Proposal:
+Dump Create boot partition /dev/sda1 (70.60 MB) with ext4
+Dump Create partition /dev/sda2 (29.99 GB) with id=8E
+Dump Create volume group system from /dev/sda2 [destructive]
+Dump Create logical volume /dev/system/home (19.49 GB) for /home with ext4
+Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4
+Dump Create swap logical volume /dev/system/swap (512.00 MB)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty4.ycp new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty4.ycp
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty4.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty4.ycp 2009-12-18 14:39:39.000000000 +0100
@@ -0,0 +1,18 @@
+// testedfiles: helper1b.yh
+{
+ include "./tests/setup-system.yh";
+
+ setup_system("empty");
+
+ include "./tests/helper1a.yh";
+
+ import "ProductFeatures";
+
+ ProductFeatures::SetBooleanFeature("partitioning", "try_separate_home", true);
+ ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", true);
+ ProductFeatures::SetBooleanFeature("partitioning", "vm_keep_unpartitioned_region", true);
+ ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB");
+ ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB");
+
+ include "./tests/helper1b.yh";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty5.out new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty5.out
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty5.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty5.out 2009-12-17 16:06:52.000000000 +0100
@@ -0,0 +1,6 @@
+Dump Proposal:
+Dump Create boot partition /dev/sda1 (70.60 MB) with ext4
+Dump Create partition /dev/sda2 (298.02 GB) with id=8E
+Dump Create volume group system from /dev/sda2 [destructive]
+Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4
+Dump Create swap logical volume /dev/system/swap (768.00 MB)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty5.ycp new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty5.ycp
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty5.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty5.ycp 2009-12-18 14:39:39.000000000 +0100
@@ -0,0 +1,17 @@
+// testedfiles: helper1b.yh
+{
+ include "./tests/setup-system.yh";
+
+ setup_system("empty");
+
+ include "./tests/helper1a.yh";
+
+ import "ProductFeatures";
+
+ ProductFeatures::SetBooleanFeature("partitioning", "try_separate_home", false);
+ ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", true);
+ ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB");
+ ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB");
+
+ include "./tests/helper1b.yh";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty6.out new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty6.out
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty6.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty6.out 2009-12-17 16:06:52.000000000 +0100
@@ -0,0 +1,7 @@
+Dump Proposal:
+Dump Create boot partition /dev/sda1 (70.60 MB) with ext4
+Dump Create partition /dev/sda2 (298.02 GB) with id=8E
+Dump Create volume group system from /dev/sda2 [destructive]
+Dump Create logical volume /dev/system/home (25.00 GB) for /home with ext4
+Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4
+Dump Create swap logical volume /dev/system/swap (768.00 MB)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty6.ycp new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty6.ycp
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/empty6.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/empty6.ycp 2009-12-18 14:39:39.000000000 +0100
@@ -0,0 +1,17 @@
+// testedfiles: helper1b.yh
+{
+ include "./tests/setup-system.yh";
+
+ setup_system("empty");
+
+ include "./tests/helper1a.yh";
+
+ import "ProductFeatures";
+
+ ProductFeatures::SetBooleanFeature("partitioning", "try_separate_home", true);
+ ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", true);
+ ProductFeatures::SetStringFeature("partitioning", "vm_desired_size", "30 GB");
+ ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB");
+
+ include "./tests/helper1b.yh";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/half-empty1.out new/yast2-storage-2.19.1/storage/src/testsuite/tests/half-empty1.out
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/half-empty1.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/half-empty1.out 2009-12-17 16:06:52.000000000 +0100
@@ -0,0 +1,5 @@
+Dump Proposal:
+Dump Create extended partition /dev/sda3 (147.09 GB)
+Dump Create swap partition /dev/sda5 (2.01 GB)
+Dump Create root partition /dev/sda6 (20.00 GB) with ext4
+Dump Create partition /dev/sda7 (125.08 GB) for /home with ext4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/half-empty1.ycp new/yast2-storage-2.19.1/storage/src/testsuite/tests/half-empty1.ycp
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/half-empty1.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/half-empty1.ycp 2009-12-18 14:39:39.000000000 +0100
@@ -0,0 +1,16 @@
+// testedfiles: helper1b.yh
+{
+ include "./tests/setup-system.yh";
+
+ setup_system("half-empty");
+
+ include "./tests/helper1a.yh";
+
+ import "ProductFeatures";
+
+ ProductFeatures::SetBooleanFeature("partitioning", "try_separate_home", true);
+ ProductFeatures::SetBooleanFeature("partitioning", "proposal_lvm", false);
+ ProductFeatures::SetStringFeature("partitioning", "root_base_size", "20 GB");
+
+ include "./tests/helper1b.yh";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/helper1a.yh new/yast2-storage-2.19.1/storage/src/testsuite/tests/helper1a.yh
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/helper1a.yh 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/helper1a.yh 2009-12-18 14:41:30.000000000 +0100
@@ -0,0 +1,39 @@
+{
+ import "Testsuite";
+
+ map READ = $[
+ "probe" : $[
+ "architecture" : "i386",
+ "bios" : [ $[ "lba_support" : true ] ],
+ "cdrom" : []
+ ],
+ "proc" : $[
+ "swaps" : [],
+ "meminfo" : $[ "memtotal" : 256 * 1024 ]
+ ],
+ "sysconfig" : $[
+ "storage" : $[
+ "DEFAULT_FS" : "ext4"
+ ],
+ "bootloader" : $[
+ "LOADER_TYPE" : "grub"
+ ],
+ "language" : $[
+ "RC_LANG" : "en_US.UTF-8",
+ "RC_LC_MESSAGES" : "",
+ ],
+ ],
+ "target" : $[
+ "size" : 0,
+ "bash_output" : $[],
+ "yast2" : $[],
+ "dir" : [],
+ ],
+ ];
+
+ Testsuite::Init([READ, $[], READ], nil);
+
+ import "Stage";
+
+ Stage::Set("initial");
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/helper1b.yh new/yast2-storage-2.19.1/storage/src/testsuite/tests/helper1b.yh
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/helper1b.yh 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/helper1b.yh 2009-12-18 14:41:35.000000000 +0100
@@ -0,0 +1,32 @@
+{
+ import "Storage";
+ import "StorageProposal";
+
+ Storage::InitLibstorage(false);
+
+ StorageProposal::GetControlCfg();
+
+ map target_map = Storage::GetTargetMap();
+ map prop = StorageProposal::get_inst_prop(target_map);
+
+ if (prop["ok"]:false)
+ {
+ Storage::SetTargetMap(prop["target"]:$[]);
+
+ list<map> infos = Storage::GetCommitInfos();
+
+ Testsuite::Dump("Proposal:");
+ foreach(map info, infos, {
+ string text = info[`text]:"";
+ if (info[`destructive]:false)
+ text = text + " [destructive]";
+ Testsuite::Dump(text);
+ });
+ }
+ else
+ {
+ Testsuite::Dump("No proposal.");
+ }
+
+ Storage::FinishLibstorage();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/reuse-home1.out new/yast2-storage-2.19.1/storage/src/testsuite/tests/reuse-home1.out
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/reuse-home1.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/reuse-home1.out 2009-12-17 16:06:52.000000000 +0100
@@ -0,0 +1,4 @@
+Dump Proposal:
+Dump Format partition /dev/sda2 (15.01 GB) for / with ext4 [destructive]
+Dump Use /dev/sda1 as swap
+Dump Set mount point of /dev/sda3 to /home
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/reuse-home1.ycp new/yast2-storage-2.19.1/storage/src/testsuite/tests/reuse-home1.ycp
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/reuse-home1.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/reuse-home1.ycp 2009-12-18 14:39:39.000000000 +0100
@@ -0,0 +1,17 @@
+// testedfiles: helper1b.yh
+{
+ include "./tests/setup-system.yh";
+
+ setup_system("reuse-home");
+
+ 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";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/setup-system.yh new/yast2-storage-2.19.1/storage/src/testsuite/tests/setup-system.yh
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/setup-system.yh 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/setup-system.yh 2009-12-18 14:41:13.000000000 +0100
@@ -0,0 +1,9 @@
+{
+ void setup_system(string name)
+ {
+ SCR::Execute(.target.bash, "mkdir -p tmp");
+ SCR::Execute(.target.bash, "rm -rf tmp/*");
+
+ SCR::Execute(.target.bash, sformat("cp data/%1/*.info tmp", name));
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/windows-only1.out new/yast2-storage-2.19.1/storage/src/testsuite/tests/windows-only1.out
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/windows-only1.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/windows-only1.out 2009-12-17 16:06:52.000000000 +0100
@@ -0,0 +1,6 @@
+Dump Proposal:
+Dump Shrink Windows partition /dev/sda1 to 33.21 GB [destructive]
+Dump Create extended partition /dev/sda2 (41.32 GB)
+Dump Create swap partition /dev/sda5 (517.72 MB)
+Dump Create root partition /dev/sda6 (16.50 GB) with ext4
+Dump Create partition /dev/sda7 (24.31 GB) for /home with ext4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/windows-only1.ycp new/yast2-storage-2.19.1/storage/src/testsuite/tests/windows-only1.ycp
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/windows-only1.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/windows-only1.ycp 2009-12-18 14:40:08.000000000 +0100
@@ -0,0 +1,17 @@
+// testedfiles: helper1b.yh
+{
+ include "./tests/setup-system.yh";
+
+ setup_system("windows-only");
+
+ 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";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/windows1.out new/yast2-storage-2.19.1/storage/src/testsuite/tests/windows1.out
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/windows1.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/windows1.out 2009-12-17 16:06:52.000000000 +0100
@@ -0,0 +1,6 @@
+Dump Proposal:
+Dump Create extended partition /dev/sda2 (34.52 GB)
+Dump Create swap partition /dev/sda5 (517.72 MB)
+Dump Create root partition /dev/sda6 (15.01 GB) with ext4
+Dump Create partition /dev/sda7 (19.01 GB) for /home with ext4
+Dump Set mount point of /dev/sda1 to /windows/C
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.19.0/storage/src/testsuite/tests/windows1.ycp new/yast2-storage-2.19.1/storage/src/testsuite/tests/windows1.ycp
--- old/yast2-storage-2.19.0/storage/src/testsuite/tests/windows1.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.19.1/storage/src/testsuite/tests/windows1.ycp 2009-12-18 14:39:39.000000000 +0100
@@ -0,0 +1,17 @@
+// testedfiles: helper1b.yh
+{
+ include "./tests/setup-system.yh";
+
+ setup_system("windows");
+
+ 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";
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org