Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at Fri Jul 23 21:36:41 CEST 2010.
--------
--- yast2-storage/yast2-storage.changes 2010-06-25 14:23:54.000000000 +0200
+++ yast2-storage/yast2-storage.changes 2010-07-23 09:55:23.000000000 +0200
@@ -1,0 +2,22 @@
+Tue Jul 20 11:26:30 CEST 2010 - fehr@suse.de
+
+- add support for additional parity values for raid5, raid6, raid10
+
+-------------------------------------------------------------------
+Wed Jul 14 10:12:46 CEST 2010 - aschnell@suse.de
+
+- improved help text (bnc #506814)
+
+-------------------------------------------------------------------
+Wed Jul 07 12:51:11 CEST 2010 - aschnell@suse.de
+
+- improved layout of dialog for importing mount points
+- added "Import Partition Setup" button
+
+-------------------------------------------------------------------
+Mon Jul 05 15:13:18 CEST 2010 - aschnell@suse.de
+
+- moved EFI detection from YCP to C++ (bnc #612867)
+- 2.20.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-storage-2.19.15.tar.bz2
New:
----
yast2-storage-2.20.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.VotRO8/_old 2010-07-23 21:35:53.000000000 +0200
+++ /var/tmp/diff_new_pack.VotRO8/_new 2010-07-23 21:35:53.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.19.15)
+# spec file for package yast2-storage (Version 2.20.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-storage
-Version: 2.19.15
+Version: 2.20.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.19.15.tar.bz2
+Source0: yast2-storage-2.20.0.tar.bz2
Prefix: /usr
@@ -31,7 +31,7 @@
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.15 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools
+BuildRequires: libstorage-devel >= 2.20.0 yast2 >= 2.19.4 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 perl = %{perl_version}
@@ -56,7 +56,7 @@
devices during installation and on an installed system.
%prep
-%setup -n yast2-storage-2.19.15
+%setup -n yast2-storage-2.20.0
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-storage-2.19.15.tar.bz2 -> yast2-storage-2.20.0.tar.bz2 ++++++
++++ 13527 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.15/VERSION new/yast2-storage-2.20.0/VERSION
--- old/yast2-storage-2.19.15/VERSION 2010-06-25 14:22:13.000000000 +0200
+++ new/yast2-storage-2.20.0/VERSION 2010-07-05 14:41:19.000000000 +0200
@@ -1 +1 @@
-2.19.15
+2.20.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.15/config.h.in new/yast2-storage-2.20.0/config.h.in
--- old/yast2-storage-2.19.15/config.h.in 2010-06-25 14:22:29.000000000 +0200
+++ new/yast2-storage-2.20.0/config.h.in 2010-07-23 09:52:31.000000000 +0200
@@ -64,6 +64,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
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.15/configure.in new/yast2-storage-2.20.0/configure.in
--- old/yast2-storage-2.19.15/configure.in 2010-06-25 14:22:20.000000000 +0200
+++ new/yast2-storage-2.20.0/configure.in 2010-07-23 09:52:18.000000000 +0200
@@ -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.15, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.20.0, 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.15"
+VERSION="2.20.0"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
@@ -220,6 +220,7 @@
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
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.15/libtool.m4 new/yast2-storage-2.20.0/libtool.m4
--- old/yast2-storage-2.19.15/libtool.m4 2010-06-25 14:22:24.000000000 +0200
+++ new/yast2-storage-2.20.0/libtool.m4 2010-07-23 09:52:25.000000000 +0200
@@ -684,7 +684,6 @@
# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
_LT_COPYING
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.15/ltversion.m4 new/yast2-storage-2.20.0/ltversion.m4
--- old/yast2-storage-2.19.15/ltversion.m4 2010-06-25 14:22:25.000000000 +0200
+++ new/yast2-storage-2.20.0/ltversion.m4 2010-07-23 09:52:26.000000000 +0200
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 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.15/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.20.0/storage/src/include/custom_part_lib.ycp
--- old/yast2-storage-2.19.15/storage/src/include/custom_part_lib.ycp 2010-05-11 16:04:26.000000000 +0200
+++ new/yast2-storage-2.20.0/storage/src/include/custom_part_lib.ycp 2010-07-06 15:38:10.000000000 +0200
@@ -13,7 +13,7 @@
*
*************************************************************
*
- $Id: custom_part_lib.ycp 61997 2010-05-11 13:42:40Z aschnell $
+ $Id: custom_part_lib.ycp 62181 2010-07-05 13:21:08Z aschnell $
*
*/
@@ -472,7 +472,7 @@
{
not_used_mp =
filter( string mp, not_used_mp,
- ``(!contains( FileSystems::system_m_points, mp)));
+ ``(!contains(FileSystems::system_m_points(), mp)));
}
if(mount == "swap")
new["mount"] = "";
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.15/storage/src/include/ep-dialogs.ycp new/yast2-storage-2.20.0/storage/src/include/ep-dialogs.ycp
--- old/yast2-storage-2.19.15/storage/src/include/ep-dialogs.ycp 2010-06-07 12:40:33.000000000 +0200
+++ new/yast2-storage-2.20.0/storage/src/include/ep-dialogs.ycp 2010-07-23 09:52:10.000000000 +0200
@@ -20,7 +20,8 @@
formatted and the desired file system type.</p>");
// helptext
- helptext = helptext + _("<p>Changing the encryption on an existing
+ helptext = helptext + _("<p>If you want to encrypt all data on the
+volume select <b>Encrypt device</b>. Changing the encryption on an existing
volume will delete all data on it.</p>");
// helptext
@@ -713,6 +714,7 @@
UI::ChangeWidget(`id(`size), `Value, `max_size);
UI::ChangeWidget(`id(`custom_size_attachment), `Enabled, false);
+ UI::ChangeWidget(`id(`custom_size_input), `Value, Storage::KByteToHumanString(size_k));
symbol widget = nil;
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.15/storage/src/include/ep-import.ycp new/yast2-storage-2.20.0/storage/src/include/ep-import.ycp
--- old/yast2-storage-2.19.15/storage/src/include/ep-import.ycp 2010-04-19 18:18:01.000000000 +0200
+++ new/yast2-storage-2.20.0/storage/src/include/ep-import.ycp 2010-07-08 16:13:49.000000000 +0200
@@ -5,13 +5,20 @@
* Authors: Michael Hager
* Johannes Buchhold
* Arvin Schnell
- *
- * This file must only be included in other Expert Partitioner files ("ep-*.ycp").
*/
{
textdomain "storage";
+ import "Directory";
+ import "FileSystems";
+ import "Label";
+ import "Popup";
+ import "Storage";
+ import "StorageFields";
+ import "StorageSettings";
+
+
string MountVar(map var, map root, string rdev, string mp, map target_map)
{
string ret = "";
@@ -209,6 +216,22 @@
}
+ string FstabAddDialogHelptext()
+ {
+ // help text, richtext format
+ string helptext = _("<p>YaST2 has scanned your hard disks and found
+one or several existing Linux systems with mount points. The old mount points
+are shown in the table.</p>");
+
+ // help text, richtext format
+ helptext = helptext + _("<p>You can choose whether the existing system
+volumes, e.g. / and /usr, will be formatted during the
+installation. Non-system volumes, e.g. /home, will not be formatted.</p>");
+
+ return helptext;
+ }
+
+
/**
* Scan exiting partitions for fstab files and if one found read the mountpoints
* from the fstab file and build a new target_map.
@@ -234,15 +257,6 @@
term table_header = StorageFields::TableHeader(fields);
- // help text, richtext format
- string help_text = _("<P><B><BIG>Attention:</BIG></B><BR>YaST2 has scanned your hard disks and found an old Linux system
-with mount points. On the right, see a list with the mount points found. </P>
-")+
- // help text, richtext format
-_("<P>To use these mount points, <BR>press <B>Yes</B>.</P>")+
- // help text, richtext format
-_("<P>To ignore these mount points, <BR> press <B>No</B>.</P>");
-
term navigate_buttons = `Empty();
if (size(fstabs) > 1)
{
@@ -255,29 +269,29 @@
UI::OpenDialog(
`opt(`decorated),
`VBox( `VSpacing(0.45),
- `ReplacePoint( `id(`heading), `Empty() ),
- `MarginBox(2, 1,
+ // dialog heading
+ `Left(`Heading(_("Import Mount Points from existing System:"))),
+ `MarginBox(1, 0.5,
`VBox(
+ `Left(`ReplacePoint(`id(`device), `Empty())),
`MinSize(60, 8, `Table(`id(`table), `opt(`keepSorting), table_header, [])),
`VSpacing(0.45),
navigate_buttons,
`VSpacing(0.45),
+ // checkbox label
`Left(`CheckBox(`id(`format_sys), _("Format system volumes"), true))
)
),
- // popup text
- `Heading(_("Would you like to use these mount points
-for your new installation?")),
- `VSpacing(0.45),
`ButtonBox(
`PushButton(`id(`help), `opt(`helpButton), Label::HelpButton()),
- `PushButton(`id(`ok), `opt(`default), Label::YesButton()),
- `PushButton(`id(`cancel), Label::NoButton())
+ // pushbutton label
+ `PushButton(`id(`ok), `opt(`default), _("Import")),
+ `PushButton(`id(`cancel), Label::CancelButton())
)
)
);
- UI::ChangeWidget(`help, `HelpText, help_text);
+ UI::ChangeWidget(`help, `HelpText, FstabAddDialogHelptext());
symbol userinput = `none;
integer idx = 0;
@@ -291,10 +305,8 @@
map new_target_map = AddFstabToTargetMap(target_map, fstab, format_sys);
// popup text %1 is replaced by a device name (e.g. /dev/hda1)
- string str = sformat(
-_("A previous system with the following mount points was detected:
-/etc/fstab found on %1"), device);
- UI::ReplaceWidget( `id(`heading), `Heading( str ) );
+ string str = sformat(_("/etc/fstab found on %1 contains:"), device);
+ UI::ReplaceWidget(`id(`device), `Label(str));
list<term> table_contents = StorageFields::TableContents(fields, new_target_map,
StorageFields::PredicateMountpoint);
@@ -308,7 +320,6 @@
}
userinput = (symbol) UI::UserInput();
- y2milestone("userinput %1", userinput);
switch (userinput)
{
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.15/storage/src/include/ep-raid-dialogs.ycp new/yast2-storage-2.20.0/storage/src/include/ep-raid-dialogs.ycp
--- old/yast2-storage-2.19.15/storage/src/include/ep-raid-dialogs.ycp 2010-05-10 18:32:34.000000000 +0200
+++ new/yast2-storage-2.20.0/storage/src/include/ep-raid-dialogs.ycp 2010-07-23 09:52:10.000000000 +0200
@@ -206,15 +206,23 @@
32 kB is a good starting point. For RAID 1, the chunk size does not affect the array very much.</p>
");
- if (raid_type == "raid5")
+ if (raid_type == "raid5" || raid_type == "raid6")
// helptext
- helptext = helptext + _("<p><b>Parity Algorithm:</b><br>The parity algorithm to use with RAID5.
+ helptext = helptext + _("<p><b>Parity Algorithm:</b><br>The parity algorithm to use with RAID5/6.
Left-symmetric is the one that offers maximum performance on typical disks with rotating platters.</p>
");
return helptext;
}
+ list<term> getParTerms( string mdtype, integer sz )
+ {
+ list<list> pars = Storage::AllowdParity( mdtype, sz );
+ return( maplist( list e, pars,
+ ``{
+ return( `item( `id(e[0]:`par_default), e[1]:"" ));
+ }));
+ }
symbol MiniWorkflowStepRaidOptions(map &data)
{
@@ -222,7 +230,7 @@
string raid_type = data["raid_type"]:"error";
integer chunk_size = (data["chunk_size_k"]:DefaultChunkSizeK(raid_type))*1024;
- symbol parity_algorithm = data["parity_algorithm"]:`left_asymmetric;
+ symbol parity_algorithm = data["parity_algorithm"]:`par_default;
list<term> chunk_sizes_list = maplist(integer i, Integer::RangeFrom(11, 22), {
return `item(`id(2 << i), Storage::ByteToHumanStringOmitZeroes(2 << i));
@@ -233,15 +241,14 @@
`id(chunk_size)))
);
- if (raid_type == "raid5")
+ list<term> par_list = getParTerms( raid_type, size(data["devices"]:[]));
+
+ if (size(par_list)>0)
options = add(options,
`Left(`ComboBoxSelected(`id(`parity_algorithm), `opt(`hstretch),
// combo box label
_("Parity &Algorithm"),
- [ `item(`id(`left_asymmetric), "left-asymmetric"),
- `item(`id(`left_symmetric), "left-symmetric"),
- `item(`id(`right_asymmetric), "right-asymmetric"),
- `item(`id(`right_symmetric), "right-symmetric") ],
+ par_list,
`id(parity_algorithm)))
);
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.15/storage/src/include/ep-raid-lib.ycp new/yast2-storage-2.20.0/storage/src/include/ep-raid-lib.ycp
--- old/yast2-storage-2.19.15/storage/src/include/ep-raid-lib.ycp 2010-01-15 16:17:49.000000000 +0100
+++ new/yast2-storage-2.20.0/storage/src/include/ep-raid-lib.ycp 2010-07-23 09:52:10.000000000 +0200
@@ -71,10 +71,11 @@
integer chunk_size_k = data["chunk_size_k"]:4;
Storage::ChangeMdChunk(nr, chunk_size_k);
- if (raid_type == `raid5) {
- symbol parity_algorithm = data["parity_algorithm"]:`left_asymmetric;
+ if( haskey( data, "parity_algorithm" ))
+ {
+ symbol parity_algorithm = data["parity_algorithm"]:`par_default;
Storage::ChangeMdParitySymbol(nr, parity_algorithm);
- }
+ }
Storage::ChangeVolumeProperties(data);
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.15/storage/src/inst_disk_proposal.ycp new/yast2-storage-2.20.0/storage/src/inst_disk_proposal.ycp
--- old/yast2-storage-2.19.15/storage/src/inst_disk_proposal.ycp 2010-01-05 15:49:22.000000000 +0100
+++ new/yast2-storage-2.20.0/storage/src/inst_disk_proposal.ycp 2010-07-08 16:13:49.000000000 +0200
@@ -35,10 +35,11 @@
include "partitioning/custom_part_dialogs.ycp";
+ include "partitioning/ep-import.ycp";
-define boolean AskOverwriteChanges()
- ``{
+boolean AskOverwriteChanges()
+ {
boolean ret = true;
string target_is = Storage::GetPartMode();
y2milestone( "AskOverwriteChanges target_is %1", target_is );
@@ -53,9 +54,17 @@
return( ret );
}
-define void execSubscreens( boolean detailed )
- ``{
- y2milestone( "execSubscreens detailed %1", detailed );
+
+void execSubscreens(symbol mode)
+ {
+ y2milestone( "execSubscreens mode:%1", mode );
+
+ if (Mode::autoinst())
+ {
+ Storage::SetPartMode("PROP_MODIFY");
+ }
+ else
+ {
map aliases =
$[ "disk" :
``(WFM::CallFunction("inst_disk", [true, true])),
@@ -66,15 +75,15 @@
"resize_ui" :
``(WFM::CallFunction("inst_resize_ui", [true, true])),
];
+
map seq = $[];
seq["disk"] = $[ `abort : `abort, `cancel: `cancel, `next: `next ];
- if (Mode::autoinst())
- {
- Storage::SetPartMode("PROP_MODIFY");
- seq["ws_start"] = "disk";
- }
- else
- {
+
+ switch (mode)
+ {
+ case `modify:
+ case `detailed:
+ {
y2milestone( "ProposalActive %1 ProposalMode %2 PartMode %3",
Storage::GetPartProposalActive(),
Storage::GetPartProposalMode(), Storage::GetPartMode() );
@@ -90,7 +99,7 @@
}
seq["disk"] = $[ `abort : `abort, `cancel: `cancel, `next : `next ];
y2milestone( "execSubscreens GetPartMode %1", Storage::GetPartMode() );
- if( detailed && Storage::GetPartMode()!="CUSTOM" )
+ if( mode == `detailed && Storage::GetPartMode()!="CUSTOM" )
seq["ws_start"] = "target_sel";
else
seq["ws_start"] = "disk";
@@ -100,7 +109,17 @@
Wizard::OpenNextBackDialog();
symbol result = Sequencer::Run(aliases, seq);
Wizard::CloseDialog();
- Storage::HandleProposalPackages();
+ }
+ break;
+
+ case `import:
+ {
+ ImportMountPoints();
+ }
+ break;
+ }
+
+ Storage::HandleProposalPackages();
}
}
@@ -121,6 +140,8 @@
// Radiobutton for partition dialog
string detailed_str = _("&Create Partition Setup...");
// Radiobutton for partition dialog
+string import_str = _("&Import Partition Setup...");
+// Radiobutton for partition dialog
string part_str = _("&Partition Based");
// Radiobutton for partition dialog
string lvm_str = _("&LVM Based");
@@ -178,11 +199,12 @@
);
term bframe =
- `HBox(
+ `VBox(
`PushButton( `id(`detailed), detailed_str ),
- `HSpacing(5),
- `PushButton( `id(`modify), modify_str ),
- `HSpacing(5)
+ `VSpacing(0.45),
+ `PushButton( `id(`import), import_str ),
+ `VSpacing(0.45),
+ `PushButton( `id(`modify), modify_str )
);
@@ -192,10 +214,10 @@
`HBox(
`HSpacing(2),
`VBox(
- `MinHeight( 7, `RichText( `id("richtext"), changes )),
+ `MinHeight(8, `RichText(`id(`richtext), changes)),
`VSpacing(1),
`RadioButtonGroup( `id("prop_mode"), rframe ),
- `VSpacing(4),
+ `VSpacing(2),
bframe,
`VStretch()
),
@@ -219,6 +241,14 @@
"), deletechars(modify_str,"&"));
// help text continued
+// %1 is replaced by button text
+help_text = help_text + sformat(_("<p>
+To import the mount points from an existing Linux
+system choose <b>%1</b>. You can still make modification
+afterwards in the expert partitioner dialog.</p>
+"), deletechars(import_str, "&"));
+
+// help text continued
help_text = help_text + sformat(_("<p>
If the suggestion does not fit your needs, create
your own partition setup starting with the partitions as
@@ -317,23 +347,28 @@
Storage::SetPartMode( target_is );
Storage::SetTargetMap( targetMap );
changes = Storage::ChangeText();
- UI::ChangeWidget( `id("richtext"), `Value, changes );
+ UI::ChangeWidget(`id(`richtext), `Value, changes);
}
else
{
UI::ChangeWidget( `id("prop_mode"), `CurrentButton, old_mode );
}
}
- else if( ret==`modify || ret==`detailed )
+ else if (contains([ `modify, `detailed, `import ], ret))
{
Storage::SetPartProposalFirst( false );
Storage::SetPartProposalActive( false );
- if( ret==`modify )
+
+ switch (ret)
+ {
+ case `modify:
{
target_is = "PROP_MODIFY";
Storage::SetPartProposalMode( "modify" );
}
- else
+ break;
+
+ case `detailed:
{
if( Storage::GetPartMode()!="CUSTOM" )
{
@@ -346,10 +381,20 @@
Storage::SetPartDisk( "" );
Storage::SetPartProposalMode( "detailed" );
}
+ break;
+
+ case `import:
+ {
+ target_is = "PROP_MODIFY";
+ Storage::SetPartProposalMode("modify");
+ }
+ break;
+ }
+
Storage::SetPartMode( target_is );
- execSubscreens( ret==`detailed );
+ execSubscreens( ret );
changes = Storage::ChangeText();
- UI::ChangeWidget( `id("richtext"), `Value, changes );
+ UI::ChangeWidget(`id(`richtext), `Value, changes);
if( ret==`detailed )
{
UI::ChangeWidget(`id(`part), `Value, !StorageProposal::GetProposalLvm());
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.15/storage/src/modules/FileSystems.ycp new/yast2-storage-2.20.0/storage/src/modules/FileSystems.ycp
--- old/yast2-storage-2.19.15/storage/src/modules/FileSystems.ycp 2010-04-19 18:18:01.000000000 +0200
+++ new/yast2-storage-2.20.0/storage/src/modules/FileSystems.ycp 2010-07-06 15:38:10.000000000 +0200
@@ -8,7 +8,7 @@
* These module contains the supported filesystems and their settings.
*
*
- * $Id: FileSystems.ycp 61748 2010-04-19 10:27:58Z aschnell $
+ * $Id: FileSystems.ycp 62181 2010-07-05 13:21:08Z aschnell $
*/
{
module "FileSystems";
@@ -63,8 +63,8 @@
global const list<symbol> possible_root_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs, `jfs ];
- global const list<string> system_m_points = [ "/", "/usr", "/var", "/opt", Partitions::BootMount() ];
- global const list<string> crypt_m_points = [ "/", Partitions::BootMount(), "/usr" ];
+ global list<string> system_m_points() { return [ "/", "/usr", "/var", "/opt", Partitions::BootMount() ]; }
+ global list<string> crypt_m_points() { return [ "/", Partitions::BootMount(), "/usr" ]; }
global const list<string> swap_m_points = [ "swap" ];
global const list<string> tmp_m_points = [ "/tmp", "/var/tmp" ];
@@ -79,7 +79,7 @@
{
suggest_m_points = [ "/home", "/srv", "/tmp", "/local" ];
if( Stage::initial() )
- suggest_m_points = (list<string>)union( system_m_points,
+ suggest_m_points = (list<string>)union( system_m_points(),
suggest_m_points );
y2milestone( "SuggestMPoints init:%1", suggest_m_points );
}
@@ -1149,10 +1149,10 @@
global define boolean IsCryptMp( string mount, boolean prefix )
``{
- boolean ret = contains( crypt_m_points, mount );
+ boolean ret = contains( crypt_m_points(), mount );
if( !ret && prefix )
{
- list<string> mp = filter(string s, system_m_points, ``(s!="/") );
+ list<string> mp = filter(string s, system_m_points(), ``(s!="/") );
foreach(string s, mp,
``{
ret = ret || search( mount, s + "/" )==0;
@@ -1164,10 +1164,10 @@
global define boolean IsSystemMp( string mount, boolean prefix )
``{
- boolean ret = contains( system_m_points, mount );
+ boolean ret = contains( system_m_points(), mount );
if( !ret && prefix )
{
- list<string> mp = filter(string s, system_m_points, ``(s!="/") );
+ list<string> mp = filter(string s, system_m_points(), ``(s!="/") );
foreach(string s, mp,
``{
ret = ret || search( mount, s + "/" )==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.15/storage/src/modules/Partitions.ycp new/yast2-storage-2.20.0/storage/src/modules/Partitions.ycp
--- old/yast2-storage-2.19.15/storage/src/modules/Partitions.ycp 2010-05-12 18:36:58.000000000 +0200
+++ new/yast2-storage-2.20.0/storage/src/modules/Partitions.ycp 2010-07-06 15:38:10.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Provides information about partitions
*
- * $Id: Partitions.ycp 62005 2010-05-12 14:57:07Z aschnell $
+ * $Id: Partitions.ycp 62181 2010-07-05 13:21:08Z aschnell $
*/
{
module "Partitions";
@@ -101,30 +101,7 @@
global boolean EfiBoot()
{
- // TODO: move to libstorage
-
- boolean ret = false;
-
- if (Arch::ia64())
- {
- ret = true;
- }
- else
- {
- if (Stage::initial())
- {
- string tmp = (string) SCR::Read(.etc.install_inf.EFI);
- if (tmp != nil && tmp == "1")
- ret = true;
- }
- else
- {
- string tmp = (string) SCR::Read(.sysconfig.bootloader.LOADER_TYPE);
- if (tmp != nil && tmp == "elilo")
- ret = true;
- }
- }
-
+ boolean ret = LibStorage::StorageInterface::getEfiBoot(sint);
y2milestone("EfiBoot 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.15/storage/src/modules/Storage.ycp new/yast2-storage-2.20.0/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.19.15/storage/src/modules/Storage.ycp 2010-05-12 18:36:58.000000000 +0200
+++ new/yast2-storage-2.20.0/storage/src/modules/Storage.ycp 2010-07-23 09:52:10.000000000 +0200
@@ -19,7 +19,7 @@
* wurde versucht "intelligent" zu gestallten und ist im einzelen bei den
* entspechenden Funktionen n�her erkl�rt.
*
- * $Id: Storage.ycp 62005 2010-05-12 14:57:07Z aschnell $
+ * $Id: Storage.ycp 62278 2010-07-20 10:07:01Z fehr $
*/
{
module "Storage";
@@ -163,20 +163,51 @@
"multipath" : LibStorage::MULTIPATH() ];
map conv_mdparity =
- $[ "def_sym" : `par_none,
- "def_int" : LibStorage::PAR_NONE(),
+ $[ "def_sym" : `par_default,
+ "def_int" : LibStorage::PAR_DEFAULT(),
"m" : $[ LibStorage::LEFT_ASYMMETRIC() : `left_asymmetric,
LibStorage::LEFT_SYMMETRIC() : `left_symmetric,
LibStorage::RIGHT_ASYMMETRIC() : `right_asymmetric,
- LibStorage::RIGHT_SYMMETRIC() : `right_symmetric
+ LibStorage::RIGHT_SYMMETRIC() : `right_symmetric,
+ LibStorage::PAR_FIRST() : `par_first,
+ LibStorage::PAR_LAST() : `par_last,
+ LibStorage::LEFT_ASYMMETRIC_6() : `left_asymmetric_6,
+ LibStorage::LEFT_SYMMETRIC_6() : `left_symmetric_6,
+ LibStorage::RIGHT_ASYMMETRIC_6() : `right_asymmetric_6,
+ LibStorage::RIGHT_SYMMETRIC_6() : `right_symmetric_6,
+ LibStorage::PAR_FIRST_6() : `par_first_6,
+ LibStorage::PAR_NEAR_2() : `par_near_2,
+ LibStorage::PAR_OFFSET_2() : `par_offset_2,
+ LibStorage::PAR_FAR_2() : `par_far_2,
+ LibStorage::PAR_NEAR_3() : `par_near_3,
+ LibStorage::PAR_OFFSET_3() : `par_offset_3,
+ LibStorage::PAR_FAR_3() : `par_far_3
]
];
map conv_parstring =
- $[ "left_asymmetric" : LibStorage::LEFT_ASYMMETRIC(),
+ $[ "default" : LibStorage::PAR_DEFAULT(),
+ "left_asymmetric" : LibStorage::LEFT_ASYMMETRIC(),
"left_symmetric" : LibStorage::LEFT_SYMMETRIC(),
"right_asymmetric" : LibStorage::RIGHT_ASYMMETRIC(),
- "right_symmetric" : LibStorage::RIGHT_SYMMETRIC() ];
+ "right_symmetric" : LibStorage::RIGHT_SYMMETRIC(),
+ "parity_first" : LibStorage::PAR_FIRST(),
+ "parity_last" : LibStorage::PAR_LAST(),
+ "left_asymmetric_6" : LibStorage::LEFT_ASYMMETRIC_6(),
+ "left_symmetric_6" : LibStorage::LEFT_SYMMETRIC_6(),
+ "right_asymmetric_6" : LibStorage::RIGHT_ASYMMETRIC_6(),
+ "right_symmetric_6" : LibStorage::RIGHT_SYMMETRIC_6(),
+ "parity_first_6" : LibStorage::PAR_FIRST_6(),
+ "n2" : LibStorage::PAR_NEAR_2(),
+ "o2" : LibStorage::PAR_OFFSET_2(),
+ "f2" : LibStorage::PAR_FAR_2(),
+ "n3" : LibStorage::PAR_NEAR_3(),
+ "o3" : LibStorage::PAR_OFFSET_3(),
+ "f3" : LibStorage::PAR_FAR_3()
+ ];
+
+map rev_conv_parstring =
+ mapmap( string s, integer i, conv_parstring, {return$[ i: s ];});
map conv_partalign =
$[ "def_sym" : `align_optimal,
@@ -322,8 +353,6 @@
LibStorage::StorageInterface::setRootPrefix(sint, Installation::destdir);
}
- LibStorage::StorageInterface::setEfiBoot(sint, Partitions::EfiBoot());
-
conts = getContainers();
y2milestone("InitLibstorage conts:%1", conts);
FileSystems::InitSlib(sint);
@@ -1331,6 +1360,11 @@
return p;
}
+global boolean HasRaidParity( string rt )
+ {
+ return( contains( [ "raid5", "raid6", "raid10" ], rt ));
+ }
+
map getContainerInfo( map c )
{
y2milestone( "getContainerInfo %1", c );
@@ -1440,13 +1474,13 @@
integer t = LibStorage::MdPartCoInfo::swig_type_get(infos);
c["raid_type"] = substring(sformat("%1", toSymbol(conv_mdtype, t)), 1);
- if (c["raid_type"]:"" == "raid5")
- {
+ if( HasRaidParity( c["raid_type"]:"" ))
+ {
t = LibStorage::MdPartCoInfo::swig_parity_get(infos);
symbol pt = toSymbol(conv_mdparity, t);
- if (pt != `par_none)
- c["parity_algorithm"] = substring(sformat("%1", pt), 1);
- }
+ if( pt != `par_default )
+ c["parity_algorithm"] = rev_conv_parstring[t]:"";
+ }
t = LibStorage::MdPartCoInfo::swig_chunkSizeK_get(infos);
if (t > 0)
{
@@ -1520,12 +1554,12 @@
p["nr"] = LibStorage::MdInfo::swig_nr_get(info);
integer t = LibStorage::MdInfo::swig_type_get(info);
p["raid_type"] = substring( sformat( "%1", toSymbol( conv_mdtype, t )), 1 );
- if( p["raid_type"]:""=="raid5" )
+ if( HasRaidParity( p["raid_type"]:"" ))
{
t = LibStorage::MdInfo::swig_parity_get(info);
symbol pt = toSymbol( conv_mdparity, t );
- if( pt != `par_none )
- p["parity_algorithm"] = substring( sformat( "%1", pt), 1 );
+ if( pt != `par_default )
+ p["parity_algorithm"] = rev_conv_parstring[t]:"";
}
p["type"] = `sw_raid;
p["fstype"] = Partitions::raid_name;
@@ -2933,7 +2967,7 @@
ret = Storage::CreateMd( p["nr"]:0, p["raid_type"]:"raid1" );
if( ret && haskey( p, "chunk_size" ))
Storage::ChangeMdChunk( p["nr"]:0, p["chunk_size"]:4 );
- if( ret && p["raid_type"]:""=="raid5" &&
+ if( ret && HasRaidParity( p["raid_type"]:"" ) &&
haskey( p, "parity_algorithm" ))
Storage::ChangeMdParity( p["nr"]:0,
p["parity_algorithm"]:"" );
@@ -5667,4 +5701,16 @@
return ret;
}
+global list<list> AllowdParity( string mdtype, integer sz )
+ {
+ integer mdt = conv_mdstring[mdtype]:0;
+ list<integer> pars =
+ LibStorage::StorageInterface::getMdAllowedParity(sint, mdt, sz );
+ list<list> ret = maplist( integer i, pars,
+ {return( [ toSymbol(conv_mdparity, i),
+ rev_conv_parstring[i]:"" ] );});
+ y2milestone( "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.15/storage/src/modules/StorageFields.ycp new/yast2-storage-2.20.0/storage/src/modules/StorageFields.ycp
--- old/yast2-storage-2.19.15/storage/src/modules/StorageFields.ycp 2010-05-14 10:45:51.000000000 +0200
+++ new/yast2-storage-2.20.0/storage/src/modules/StorageFields.ycp 2010-07-23 09:52:10.000000000 +0200
@@ -375,7 +375,7 @@
case `parity_algorithm:
// helptext for table column and overview entry
ret = ret + _("<b>Parity Algorithm</b> shows the parity
-algorithm for RAID devices with RAID type 5.");
+algorithm for RAID devices with RAID type 5, 6 or 10.");
break;
case `pe_size:
@@ -807,7 +807,8 @@
case `chunk_size:
{
string value = "";
- if (contains(["raid0", "raid5"], data["raid_type"]:"")) {
+ if (data["raid_type"]:""=="raid0" ||
+ Storage::HasRaidParity(data["raid_type"]:"")) {
integer chunksize = data["chunk_size"]:0;
value = Storage::KByteToHumanStringOmitZeroes(chunksize);
}
@@ -821,7 +822,7 @@
case `parity_algorithm:
{
string value = "";
- if (contains(["raid5"], data["raid_type"]:"")) {
+ if (Storage::HasRaidParity(data["raid_type"]:"")) {
value = data["parity_algorithm"]:"";
value = mergestring(splitstring(value, "_"), "-");
}
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.15/storage/src/testsuite/data/Makefile.am new/yast2-storage-2.20.0/storage/src/testsuite/data/Makefile.am
--- old/yast2-storage-2.19.15/storage/src/testsuite/data/Makefile.am 2010-01-05 15:49:22.000000000 +0100
+++ new/yast2-storage-2.20.0/storage/src/testsuite/data/Makefile.am 2010-07-06 15:38:10.000000000 +0200
@@ -2,5 +2,5 @@
# Makefile.am for storage/storage/src/testsuite/data
#
-SUBDIRS = empty half-empty reuse-home windows windows-only
+SUBDIRS = empty empty-efi 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.15/storage/src/testsuite/data/empty-efi/Makefile.am new/yast2-storage-2.20.0/storage/src/testsuite/data/empty-efi/Makefile.am
--- old/yast2-storage-2.19.15/storage/src/testsuite/data/empty-efi/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.20.0/storage/src/testsuite/data/empty-efi/Makefile.am 2010-07-06 15:38:10.000000000 +0200
@@ -0,0 +1,6 @@
+#
+# Makefile.am for storage/storage/src/testsuite/data/empty-efi
+#
+
+EXTRA_DIST = disk_sda.info arch.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.15/storage/src/testsuite/data/empty-efi/arch.info new/yast2-storage-2.20.0/storage/src/testsuite/data/empty-efi/arch.info
--- old/yast2-storage-2.19.15/storage/src/testsuite/data/empty-efi/arch.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.20.0/storage/src/testsuite/data/empty-efi/arch.info 2010-07-06 15:38:10.000000000 +0200
@@ -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' --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.15/storage/src/testsuite/data/empty-efi/disk_sda.info new/yast2-storage-2.20.0/storage/src/testsuite/data/empty-efi/disk_sda.info
--- old/yast2-storage-2.19.15/storage/src/testsuite/data/empty-efi/disk_sda.info 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.20.0/storage/src/testsuite/data/empty-efi/disk_sda.info 2010-07-06 15:38:10.000000000 +0200
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<disk>
+ <name>sda</name>
+ <device>/dev/sda</device>
+ 312571224
+ <major>8</major>
+ <minor>64</minor>
+ <range>256</range>
+ <cylinder>38913</cylinder>
+ <head>255</head>
+ <sector>63</sector>
+ <label>gpt</label>
+ 128
+</disk>
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.15/storage/src/testsuite/tests/empty-efi1.out new/yast2-storage-2.20.0/storage/src/testsuite/tests/empty-efi1.out
--- old/yast2-storage-2.19.15/storage/src/testsuite/tests/empty-efi1.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.20.0/storage/src/testsuite/tests/empty-efi1.out 2010-07-06 15:38:10.000000000 +0200
@@ -0,0 +1,4 @@
+Dump Proposal:
+Dump Create boot volume /dev/sda1 (70.60 MB) with vfat
+Dump Create swap volume /dev/sda2 (517.72 MB)
+Dump Create root volume /dev/sda3 (297.51 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.15/storage/src/testsuite/tests/empty-efi1.ycp new/yast2-storage-2.20.0/storage/src/testsuite/tests/empty-efi1.ycp
--- old/yast2-storage-2.19.15/storage/src/testsuite/tests/empty-efi1.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.20.0/storage/src/testsuite/tests/empty-efi1.ycp 2010-07-06 15:38:10.000000000 +0200
@@ -0,0 +1,17 @@
+// testedfiles: helper1b.yh
+{
+ include "./tests/setup-system.yh";
+
+ setup_system("empty-efi");
+
+ 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.15/storage/src/testsuite/tests/empty-efi2.out new/yast2-storage-2.20.0/storage/src/testsuite/tests/empty-efi2.out
--- old/yast2-storage-2.19.15/storage/src/testsuite/tests/empty-efi2.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.20.0/storage/src/testsuite/tests/empty-efi2.out 2010-07-06 15:38:10.000000000 +0200
@@ -0,0 +1,5 @@
+Dump Proposal:
+Dump Create boot volume /dev/sda1 (70.60 MB) with vfat
+Dump Create swap volume /dev/sda2 (2.01 GB)
+Dump Create root volume /dev/sda3 (20.00 GB) with ext4
+Dump Create volume /dev/sda4 (276.01 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.15/storage/src/testsuite/tests/empty-efi2.ycp new/yast2-storage-2.20.0/storage/src/testsuite/tests/empty-efi2.ycp
--- old/yast2-storage-2.19.15/storage/src/testsuite/tests/empty-efi2.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.20.0/storage/src/testsuite/tests/empty-efi2.ycp 2010-07-06 15:38:10.000000000 +0200
@@ -0,0 +1,17 @@
+// testedfiles: helper1b.yh
+{
+ include "./tests/setup-system.yh";
+
+ setup_system("empty-efi");
+
+ 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";
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org