Hello community,
here is the log from the commit of package yast2-storage
checked in at Thu Sep 21 22:05:30 CEST 2006.
--------
--- yast2-storage/yast2-storage.changes 2006-09-18 19:46:41.000000000 +0200
+++ yast2-storage/yast2-storage.changes 2006-09-21 19:11:49.000000000 +0200
@@ -1,0 +2,26 @@
+Thu Sep 21 13:11:34 CEST 2006 - fehr@suse.de
+
+- fix problem propagating mkfs options to libstorage
+- add dir_index option for ext3 formats (feature #301236)
+- make dir_index option default for ext3 formats
+- fix problem with ancryption and noauto (#204942)
+- version 2.14.6
+
+-------------------------------------------------------------------
+Wed Sep 20 12:25:52 CEST 2006 - fehr@suse.de
+
+- consistently use Partitions::Defaultfs() wherever needed
+- fix problem with handling of swap on different disks in
+ LVM/EVMS proposal
+
+-------------------------------------------------------------------
+Tue Sep 19 13:11:19 CEST 2006 - fehr@suse.de
+
+- fix wrong icon name (#206485)
+- add spaces to popup texts (#205097)
+- use .local.bash instead of .target.bash in Storage::NumLoopDevices()
+- add patch by Lukas to make expert partitioner information level
+ configurable (#204111)
+- improve help text of expert partitioner (#204111)
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.14.5.tar.bz2
New:
----
yast2-storage-2.14.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.pQcF4s/_old 2006-09-21 21:58:15.000000000 +0200
+++ /var/tmp/diff_new_pack.pQcF4s/_new 2006-09-21 21:58:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.14.5)
+# spec file for package yast2-storage (Version 2.14.6)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-storage
-Version: 2.14.5
+Version: 2.14.6
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.14.5.tar.bz2
+Source0: yast2-storage-2.14.6.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings
@@ -40,7 +40,7 @@
%prep
-%setup -n yast2-storage-2.14.5
+%setup -n yast2-storage-2.14.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -165,6 +165,23 @@
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog -n yast2-storage
+* Thu Sep 21 2006 - fehr@suse.de
+- fix problem propagating mkfs options to libstorage
+- add dir_index option for ext3 formats (feature #301236)
+- make dir_index option default for ext3 formats
+- fix problem with ancryption and noauto (#204942)
+- version 2.14.6
+* Wed Sep 20 2006 - fehr@suse.de
+- consistently use Partitions::Defaultfs() wherever needed
+- fix problem with handling of swap on different disks in
+ LVM/EVMS proposal
+* Tue Sep 19 2006 - fehr@suse.de
+- fix wrong icon name (#206485)
+- add spaces to popup texts (#205097)
+- use .local.bash instead of .target.bash in Storage::NumLoopDevices()
+- add patch by Lukas to make expert partitioner information level
+ configurable (#204111)
+- improve help text of expert partitioner (#204111)
* Mon Sep 18 2006 - fehr@suse.de
- add feature to have LVM/EVMS based proposals
(feature #193, feature #300169)
++++++ yast2-storage-2.14.5.tar.bz2 -> yast2-storage-2.14.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/VERSION new/yast2-storage-2.14.6/VERSION
--- old/yast2-storage-2.14.5/VERSION 2006-09-18 19:46:49.000000000 +0200
+++ new/yast2-storage-2.14.6/VERSION 2006-09-21 18:52:56.000000000 +0200
@@ -1 +1 @@
-2.14.5
+2.14.6
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/libstorage/src/Dm.cc new/yast2-storage-2.14.6/libstorage/src/Dm.cc
--- old/yast2-storage-2.14.5/libstorage/src/Dm.cc 2006-08-30 16:46:28.000000000 +0200
+++ new/yast2-storage-2.14.6/libstorage/src/Dm.cc 2006-09-21 18:49:43.000000000 +0200
@@ -68,6 +68,7 @@
pe_map.clear();
map::iterator mit;
unsigned long long pesize = pec()->peSize();
+ y2mil("pesize:" << pesize );
for( unsigned i=0; i> le;
+ y2mil( "le:" << le );
le /= 2;
- le += pesize-1;
- le /= pesize;
+ y2mil( "le:" << le );
+ if( pesize>0 )
+ {
+ le += pesize-1;
+ y2mil( "le:" << le );
+ le /= pesize;
+ y2mil( "le:" << le );
+ }
list<string> sl = splitString( extractNthWord( 2, line, true ));
y2mil( "sl:" << sl );
Regex devspec( "^[0-9]+:[0-9]+$" );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/lvm/src/lvm_config_ui.ycp new/yast2-storage-2.14.6/lvm/src/lvm_config_ui.ycp
--- old/yast2-storage-2.14.5/lvm/src/lvm_config_ui.ycp 2006-06-01 11:40:39.000000000 +0200
+++ new/yast2-storage-2.14.6/lvm/src/lvm_config_ui.ycp 2006-09-20 12:26:33.000000000 +0200
@@ -9,7 +9,7 @@
* Authors:
* mike
*
- * $Id: lvm_config_ui.ycp 31230 2006-06-01 09:40:36Z fehr $
+ * $Id: lvm_config_ui.ycp 33002 2006-09-20 10:28:09Z fehr $
*
*
*----------------------------------------------------
@@ -340,7 +340,7 @@
{
map Lv = $[
"create" : true,
- "used_fs" : `reiser,
+ "used_fs" : Partitions::DefaultFs(),
"size_k" : max_size/4/pesize*pesize/1024,
"stripes" : 1,
"format" : true,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/include/auto_part_create.ycp new/yast2-storage-2.14.6/storage/src/include/auto_part_create.ycp
--- old/yast2-storage-2.14.5/storage/src/include/auto_part_create.ycp 2006-09-18 20:42:33.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/include/auto_part_create.ycp 2006-09-21 13:14:47.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose: This module creates the neccessary partitions
* in the targetMap
*
- * $Id: auto_part_create.ycp 32959 2006-09-18 18:44:08Z fehr $
+ * $Id: auto_part_create.ycp 33025 2006-09-21 11:16:24Z fehr $
*
* used globals
*
@@ -70,7 +70,7 @@
p = remove( p, "delete" );
first = false;
p["format"] = true;
- p["used_fs"] = Partitions::default_fs;
+ p["used_fs"] = Partitions::DefaultFs();
p["mount"] = "/";
y2milestone( "create_partitions single p %1", p );
}
@@ -125,6 +125,8 @@
``{
if( size(p["mount"]:"")>0 && !p["delete"]:false )
p["fstopt"] = FileSystems::DefaultFstabOptions( p );
+ if( p["format"]:false && !p["delete"]:false )
+ p["fs_options"] = FileSystems::DefaultFormatOptions( p );
return( p );
});
ret = size(partitions)>0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.14.6/storage/src/include/custom_part_dialogs.ycp
--- old/yast2-storage-2.14.5/storage/src/include/custom_part_dialogs.ycp 2006-09-05 18:41:26.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/include/custom_part_dialogs.ycp 2006-09-21 13:11:58.000000000 +0200
@@ -16,7 +16,7 @@
*
*************************************************************
- $Id: custom_part_dialogs.ycp 32707 2006-09-05 16:42:51Z fehr $
+ $Id: custom_part_dialogs.ycp 33024 2006-09-21 11:13:35Z fehr $
*/
{
@@ -330,9 +330,11 @@
* @parm new_val map that contains a partition
* @parm file_systems filesystem definitions
*/
-define map FileSystemOptions( map org_fs_options, map fs_define )
+define map FileSystemOptions( map< any, map > org_fs_options,
+ map fs_define )
``{
- map > fs_options = (map >)eval(org_fs_options);
+ y2milestone( "FileSystemOptions org_fs_options %1", org_fs_options );
+ map > fs_options = org_fs_options;
term contents = `VBox(`VSpacing (1));
string helptext = "";
@@ -372,13 +374,13 @@
Label::CancelButton())))
))));
- foreach(any query_key, map option_map, fs_options ,
+ foreach(any query_key, map option_map, fs_options,
``{
UI::ChangeWidget( `id(query_key), `Value,
- option_map["option_value"]:"" );
+ option_map["option_value"]:(any)"" );
});
-
+ list<any> iglist = ["auto", "none", "default"];
symbol ret = `ok;
repeat
{
@@ -403,17 +405,23 @@
fs_option["option_blank"] = true;
}
-
- if( is( query, string) &&
- !contains( (list<any>)["auto", "none", "default"],
- query ))
+ if( is( query, string) && !contains( iglist, query ))
{
ret = DoInputChecks( entry, (string)query );
}
- if( query != entry[`default]:nil && ret != `error )
+ if( ret!=`error )
{
- fs_options[entry[`query_key]:nil] = fs_option;
+ if( query!=entry[`default]:nil &&
+ !contains( iglist, query ))
+ {
+ fs_options[entry[`query_key]:nil] = fs_option;
+ }
+ else if( haskey( fs_options, entry[`query_key]:nil ))
+ {
+ fs_options = remove( fs_options,
+ entry[`query_key]:nil );
+ }
}
y2milestone( "FileSystemOptions fs_options %1", fs_options );
}
@@ -423,9 +431,10 @@
UI::CloseDialog();
- if( ret == `ok )
- return fs_options;
- return ( org_fs_options );
+ if( ret != `ok )
+ fs_options = org_fs_options;
+ y2milestone("FileSystemOptions ret %1", fs_options );
+ return( fs_options );
}
void PopupNoSlashLabel()
@@ -833,14 +842,14 @@
fs_sel[file_system_name,"selected"] = file_system_name == `swap;
else
fs_sel[file_system_name,"selected"] =
- new_val["used_fs"]:`reiser == file_system_name;
+ new_val["used_fs"]:Partitions::DefaultFs() == file_system_name;
}
});
y2debug( "fs_sel=%1", fs_sel );
- if( haskey( fs_sel, `reiser ) &&
+ if( haskey( fs_sel, Partitions::DefaultFs() ) &&
size(filter( any k, map e, fs_sel, ``(e["selected"]:false) ))==0 )
{
- fs_sel[`reiser,"selected"] = true;
+ fs_sel[Partitions::DefaultFs(),"selected"] = true;
}
foreach( symbol fs_type, map entry, fs_sel,
``{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/include/custom_part_helptexts.ycp new/yast2-storage-2.14.6/storage/src/include/custom_part_helptexts.ycp
--- old/yast2-storage-2.14.5/storage/src/include/custom_part_helptexts.ycp 2006-05-04 12:22:04.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/include/custom_part_helptexts.ycp 2006-09-19 19:42:17.000000000 +0200
@@ -20,7 +20,7 @@
*
*************************************************************
- $Id: custom_part_helptexts.ycp 28947 2006-03-14 11:10:57Z fehr $
+ $Id: custom_part_helptexts.ycp 32991 2006-09-19 17:43:52Z fehr $
*/
@@ -168,10 +168,10 @@
``{
string help_text = "";
- // helptext expert partitioning. 1 of 16
+ // helptext expert partitioning. 1
help_text = _("<p> Partition your hard disks... </p>");
- // helptext expert partitioning. 2 of 16
+ // helptext expert partitioning. 2
help_text = help_text + _("<p>
This is intended for <b>experts</b>.
If you are not familiar with the concepts of hard disk <b>partitions</b>
@@ -180,7 +180,7 @@
</p>");
if( installation )
{
- // helptext expert partitioning. 3 of 16
+ // helptext expert partitioning. 3
help_text = help_text + _("<p>
Please note that <b>nothing will be written to your hard disk</b>
until you confirm the entire installation in the last installation dialog.
@@ -189,7 +189,7 @@
}
else
{
- // helptext expert partitioning. 3 of 16
+ // helptext expert partitioning. 3
help_text = help_text + _("<p>
<b>Nothing will be written to your hard disk</b>
until you confirm all your changes with the \"Apply\" button.
@@ -205,13 +205,13 @@
managed by LVM.</p>
");
- // helptext expert partitioning. 4 of 16
+ // helptext expert partitioning. 4
help_text = help_text + _("<p>
The table to the right shows the current partitions on all your hard disks.
</p>
");
- // helptext expert partitioning. 5 of 16
+ // helptext expert partitioning. 5
help_text = help_text + _("<p><b>Hard disks</b> are designated like this </p>") +
// help text
_("<tt>/dev/hda </tt>1st EIDE disk
@@ -225,17 +225,17 @@
_("<p><tt>/dev/sda </tt>1st SCSI disk
<tt>/dev/sdb </tt>2nd SCSI disk
<tt>/dev/sdc </tt>3rd SCSI disk</p>");
- // helptext expert partitioning. 6 of 16
+ // helptext expert partitioning. 6
help_text = help_text + _("<p>etc.</p>")+
// help text
_("<p>
This notation always refers to the entire disk.
</p>");
- // helptext expert partitioning. 7 of 16
+ // helptext expert partitioning. 7
help_text = help_text + _("<p>
<b>Partitions</b> are designated like this:
</p>");
- // helptext expert partitioning. 8 of 16
+ // helptext expert partitioning. 8
help_text = help_text + _("<p><tt>/dev/hda1 </tt>1st primary partition on the 1st EIDE disk.</p>")+
// helptext expert partitioning
_("<p><tt>/dev/hda2 </tt>2nd primary partition on the 1st EIDE disk.</p>") +
@@ -244,25 +244,25 @@
_("<p><tt>/dev/hda5 </tt>1st logical partition within the extended partition on
the first EIDE disk. <b>Note:</b> this is always #5, even if there are less than four
primary partitions.</p>");
- // helptext expert partitioning. 9 of 16
+ // helptext expert partitioning. 9
help_text = help_text + _("<p><tt>/dev/hda6 </tt>2nd logical partition</p>")+
"<p>...</p>" +
// helptext expert partitioning
_("<p><tt>/dev/sda1</tt>, etc., for SCSI.</p>");
- // helptext expert partitioning. 10 of 16
+ // helptext expert partitioning. 10
help_text = help_text + _("<p>
On the i386 platform (i.e., normal PCs), there cannot be more than four
<b>primary partitions</b> on any hard disk, because the respective table in the
master boot record cannot contain more than four entries.
</p>
");
- // helptext expert partitioning. 11 of 16
+ // helptext expert partitioning. 11
help_text = help_text + _("<p>
Older PCs may have a <b>BIOS</b> limitation that restricts bootable
partitions to cylinders below <b>1024</b>.
</p>
");
- // helptext expert partitioning. 12 of 16
+ // helptext expert partitioning. 12
help_text = help_text + _("<p>
If you have an older PC and want to boot from a partition, make sure it ends below this
1024 cylinder boundary. Create a separate partition and mount it as
@@ -270,12 +270,12 @@
(at least 12 MB) is usually sufficient for that.
</p>
");
- // helptext expert partitioning. 13 of 16
+ // helptext expert partitioning. 13
help_text = help_text + _("<p>
One of the four primary partitions may be an <b>extended partition</b>.
This extended partition can contain one or more <b>logical partitions</b>.
</p>");
- // helptext expert partitioning. 14 of 16
+ // helptext expert partitioning. 14
help_text = help_text + _("<p>
The extended partition itself cannot hold any data.
To use its space, create logical partitions.
@@ -284,25 +284,37 @@
operating systems.
</p>
");
- // helptext expert partitioning. 15 of 16
+ // helptext expert partitioning. 15
help_text = help_text + _("<p>
In connection with advanced boot managers such as <b>LILO</b>, you can even
boot your computer from a logical partition.
</p>");
- // helptext expert partitioning. 16 of 16
+ // helptext expert partitioning. 16
help_text = help_text + _("<p>
The extended partition will <b>overlap</b> with the logical
partitions: for an extended partition from cylinder 200 to 500, logical
partitions could range from, for example, 200 to 250, 251 to 400, and 401 to 500.
</p>
");
- // helptext expert partitioning. 17 of 16
+ // helptext expert partitioning. 17
help_text = help_text + _("<p>
An asterisk (*) after the mount point indicates a file system that is
currently not mounted (for example, because it has the <tt>noauto</tt> option set in <tt>/etc/fstab</tt>).
</p>
");
- // helptext expert partitioning. 18 of 16
+ // helptext expert partitioning. 18
+ help_text = help_text + _("<p>
+The column labeled <b>F</b> contains flags. <tt>C</tt> means the partition is encrypted.
+<tt>F</tt> means the partition is selected to be formatted.
+</p>
+");
+ // helptext expert partitioning. 19
+ help_text = help_text + _("<p>
+<b>Used By</b> tells if a device is used by LVM, RAID or EVMS. If you do not use such
+things, it is perfectly normal for this columen to be empty.
+</p>
+");
+ // helptext expert partitioning. 20
help_text = help_text + _("<p>
<b>Mount By</b> indicates how the file system is mounted: (K) by Kernel Name,
(L) by Label, (U) by UUID, (I) by Device ID, and (P) by Device Path.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.14.6/storage/src/include/custom_part_lib.ycp
--- old/yast2-storage-2.14.5/storage/src/include/custom_part_lib.ycp 2006-09-07 17:30:43.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/include/custom_part_lib.ycp 2006-09-21 19:12:06.000000000 +0200
@@ -13,7 +13,7 @@
*
*************************************************************
*
- $Id: custom_part_lib.ycp 32767 2006-09-07 15:32:20Z fehr $
+ $Id: custom_part_lib.ycp 33040 2006-09-21 17:13:41Z fehr $
*
*/
@@ -460,7 +460,7 @@
}
if( !new["format"]:false )
{
- new = filter(string key, any value, new, ``( key != "fs_options"));
+ new = filter(string key, any value, new, ``(key != "fs_options"));
}
y2milestone( "ret:%1 new:%2", ret, new );
ret["map"] = new;
@@ -485,8 +485,7 @@
else
new["enc_type"] = `none;
if( crypt_fs &&
- size(Storage::GetCryptPwd( new["device"]:"" ))==0 &&
- (!new["noauto"]:false||new["format"]:false) )
+ size(Storage::GetCryptPwd( new["device"]:"" ))==0 )
{
string fs_passwd = DlgCreateCryptFs( new["device"]:"", new["format"]:false?8:5, new["format"]:false );
// Ask the user for a password for cryptofs, else set crypto to nil??
@@ -623,7 +622,7 @@
new["fstopt"] = fstopt;
if( !init )
{
- new["fs_options"] = $[];
+ new["fs_options"] = FileSystems::DefaultFormatOptions(new);
new["fstopt"] = fstopt;
integer max_len = FileSystems::LabelLength( used_fs );
@@ -703,11 +702,11 @@
{
if( new["detected_fs"]:`unknown != `unknown )
{
- dfs = new["detected_fs"]:Partitions::default_fs;
+ dfs = new["detected_fs"]:Partitions::DefaultFs();
}
else
{
- dfs = new["used_fs"]:Partitions::default_fs;
+ dfs = new["used_fs"]:Partitions::DefaultFs();
}
UI::ChangeWidget( `id(`fs), `Value, dfs );
}
@@ -719,6 +718,7 @@
file_systems );
if( format )
{
+ new["fs_options"] = FileSystems::DefaultFormatOptions(new);
if( !contains( selected_fs[`alt_fsid]:[], new["fsid"]:0 ))
new["fsid"] = selected_fs[`fsid]:Partitions::fsid_native;
}
@@ -743,18 +743,6 @@
selected_fs[`fsid_item]:"" );
}
}
- if( Arch::s390 () && format )
- {
- if (new["used_fs"]:`unknown != `jfs)
- {
- new["fs_options"] = $["opt_blocksize":$["option_str":"-b",
- "option_value":"4096"]];
- }
- else
- {
- new["fs_options"] = $[];
- }
- }
if( !format )
{
new["fs_options"] = $[];
@@ -795,19 +783,6 @@
UI::ChangeWidget( `id(`fsid_point), `Value,
selected_fs[`fsid_item]:"");
}
- if( Arch::s390 () && new["format"]:false )
- {
- if (new["used_fs"]:`unknown != `jfs)
- {
- new["fs_options"] =
- $["opt_blocksize":$["option_str":"-b",
- "option_value":"4096"]];
- }
- else
- {
- new["fs_options"] = $[];
- }
- }
}
}
}
@@ -848,9 +823,9 @@
}
else if( fs_int == Partitions::fsid_native )
{
- new["used_fs"] = Partitions::default_fs;
+ new["used_fs"] = Partitions::DefaultFs();
UI::ChangeWidget( `id(`fs), `Value, new["used_fs"]:`unknown );
- new = HandleFsChanged( init, new, Partitions::default_fs,
+ new = HandleFsChanged( init, new, Partitions::DefaultFs(),
file_systems );
}
else if( fs_int == Partitions::fsid_swap )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.14.6/storage/src/include/do_proposal_flexible.ycp
--- old/yast2-storage-2.14.5/storage/src/include/do_proposal_flexible.ycp 2006-09-18 20:42:34.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/include/do_proposal_flexible.ycp 2006-09-21 13:11:58.000000000 +0200
@@ -14,7 +14,7 @@
*
*************************************************************
- $Id: do_proposal_flexible.ycp 32959 2006-09-18 18:44:08Z fehr $
+ $Id: do_proposal_flexible.ycp 33024 2006-09-21 11:13:35Z fehr $
*/
{
@@ -780,7 +780,8 @@
y2milestone( "process_partition_data reuse part %1", p );
p["format"] = true;
p["mount"] = mount;
- p["used_fs"] = solution["partitions",pindex,"fsys"]:`reiser;
+ p["used_fs"] =
+ solution["partitions",pindex,"fsys"]:Partitions::DefaultFs();
value = solution["partitions",pindex,"fstopt"]:"";
if( size(value)>0 )
{
@@ -790,6 +791,7 @@
{
p["fstopt"] = FileSystems::DefaultFstabOptions( p );
}
+ p["fs_options"] = FileSystems::DefaultFormatOptions( p );
value = solution["partitions",pindex,"fopt"]:"";
if( size(value)>0 )
{
@@ -873,7 +875,7 @@
part["size_k"] = part["region",1]:0 * disk["cyl_size"]:0 / 1024;
part["mount"] = mount;
part["used_fs"] =
- solution["partitions",pindex,"fsys"]:`reiser;
+ solution["partitions",pindex,"fsys"]:Partitions::DefaultFs();
value = solution["partitions",pindex,"fstopt"]:"";
if( size(value)>0 )
{
@@ -883,6 +885,7 @@
{
part["fstopt"] = FileSystems::DefaultFstabOptions( part );
}
+ part["fs_options"] = FileSystems::DefaultFormatOptions( part );
value = solution["partitions",pindex,"fopt"]:"";
if( size(value)>0 )
{
@@ -950,7 +953,7 @@
}
part["mount"] = mount;
part["used_fs"] =
- solution["partitions",pindex,"fsys"]:`reiser;
+ solution["partitions",pindex,"fsys"]:Partitions::DefaultFs();
value = solution["partitions",pindex,"fstopt"]:"";
if( size(value)>0 )
{
@@ -960,6 +963,7 @@
{
part["fstopt"] = FileSystems::DefaultFstabOptions( part );
}
+ part["fs_options"] = FileSystems::DefaultFormatOptions( part );
value = solution["partitions",pindex,"fopt"]:"";
if( size(value)>0 )
{
@@ -2177,7 +2181,7 @@
ret["targets"] = Storage::SetPartitionData( tgmap,
swaps[0,"device"]:"",
"mount", "swap" );
- ret["targets"] = Storage::DelPartitionData( tgmap,
+ ret["targets"] = Storage::DelPartitionData( ret["targets"]:$[],
swaps[0,"device"]:"",
"vg" );
}
@@ -2221,6 +2225,8 @@
p["format"] = true;
p["fstopt"] =
FileSystems::DefaultFstabOptions( p );
+ p["fs_options"] =
+ FileSystems::DefaultFormatOptions( p );
}
return( p );
});
@@ -2255,9 +2261,11 @@
p["device"]:""==pl[0,"device"]:"" )
{
p["mount"] = mp;
- p["used_fs"] = Partitions::default_fs;
+ p["used_fs"] = Partitions::DefaultFs();
p["format"] = true;
p["fstopt"] = FileSystems::DefaultFstabOptions( p );
+ p["fs_options"] =
+ FileSystems::DefaultFormatOptions( p );
}
return( p );
});
@@ -2290,7 +2298,7 @@
list<map> ret = [];
y2milestone( "get_proposal have_swap:%1 disk %2", have_swap, disk );
map root = $[ "mount" : "/", "increasable" : true,
- "fsys" : Partitions::default_fs, "size" : 0 ];
+ "fsys" : Partitions::DefaultFs(), "size" : 0 ];
map opts = Storage::GetControlCfg();
map conf = $[ "partitions" : [] ];
list swap_sizes = [];
@@ -2308,7 +2316,7 @@
if( Storage::ProposalHome() && opts["home_limit"]:0 < avail_size )
{
map home = $[ "mount" : "/home", "increasable" : true,
- "fsys" : Partitions::default_fs, "size" : 512*1024*1024,
+ "fsys" : Partitions::DefaultFs(), "size" : 512*1024*1024,
"pct" : 100-opts["root_percent"]:40 ];
conf["partitions"] = maplist( map p, conf["partitions"]:[],
``{
@@ -2603,7 +2611,7 @@
target = Storage::AddWinInfo(target);
ret["target"] = target;
map root = $[ "mount" : "/", "increasable" : true,
- "fsys" : Partitions::default_fs, "size" : 0 ];
+ "fsys" : Partitions::DefaultFs(), "size" : 0 ];
map opts = Storage::GetControlCfg();
list<string> ddev = get_disk_try_list( target, true );
string sol_disk = "";
@@ -2776,7 +2784,7 @@
opts["home_limit"]:0 < avail_size )
{
map home = $[ "mount" : "/home", "increasable" : true,
- "fsys" : Partitions::default_fs,
+ "fsys" : Partitions::DefaultFs(),
"size" : 512*1024*1024,
"pct" : 100-opts["root_percent"]:40 ];
conf["partitions"] =
@@ -3256,11 +3264,12 @@
if( root==nil && root_pe>0 )
{
map p = $[ "create":true, "name" : "root",
- "format":true, "used_fs" : Partitions::default_fs,
+ "format":true, "used_fs" : Partitions::DefaultFs(),
"device" : ret["device"]:"" + "/root",
"mount" : "/",
"size_k" : pe_to_sizek(root_pe,pe) ];
p["fstopt"] = FileSystems::DefaultFstabOptions( p );
+ p["fs_options"] = FileSystems::DefaultFormatOptions( p );
y2milestone( "modify_vm created %1", p );
ret["partitions"] = add( ret["partitions"]:[], p );
}
@@ -3274,9 +3283,10 @@
p["format"] = true;
if( p["detected_fs"]:`unknown==`unknown )
{
- p["used_fs"] = Partitions::default_fs;
+ p["used_fs"] = Partitions::DefaultFs();
}
p["fstopt"] = FileSystems::DefaultFstabOptions( p );
+ p["fs_options"] = FileSystems::DefaultFormatOptions( p );
y2milestone( "modify_vm reuse %1", p );
}
return(p);
@@ -3290,6 +3300,7 @@
"mount" : "swap",
"size_k" : pe_to_sizek(swap_pe,pe) ];
p["fstopt"] = FileSystems::DefaultFstabOptions( p );
+ p["fs_options"] = FileSystems::DefaultFormatOptions( p );
y2milestone( "modify_vm created %1", p );
ret["partitions"] = add( ret["partitions"]:[], p );
}
@@ -3304,6 +3315,7 @@
{
p["format"] = true;
p["used_fs"] = `swap;
+ p["fs_options"] = FileSystems::DefaultFormatOptions( p );
}
p["fstopt"] = FileSystems::DefaultFstabOptions( p );
y2milestone( "modify_vm reuse %1", p );
@@ -3314,11 +3326,12 @@
if( home==nil && home_pe>0 )
{
map p = $[ "create":true, "name" : "home",
- "format":true, "used_fs" : Partitions::default_fs,
+ "format":true, "used_fs" : Partitions::DefaultFs(),
"device" : ret["device"]:"" + "/home",
"mount" : "/home",
"size_k" : pe_to_sizek(home_pe,pe) ];
p["fstopt"] = FileSystems::DefaultFstabOptions( p );
+ p["fs_options"] = FileSystems::DefaultFormatOptions( p );
y2milestone( "modify_vm created %1", p );
ret["partitions"] = add( ret["partitions"]:[], p );
}
@@ -3332,7 +3345,8 @@
if( p["detected_fs"]:`unknown==`unknown )
{
p["format"] = true;
- p["used_fs"] = Partitions::default_fs;
+ p["used_fs"] = Partitions::DefaultFs();
+ p["fs_options"] = FileSystems::DefaultFormatOptions( p );
}
p["fstopt"] = FileSystems::DefaultFstabOptions( p );
y2milestone( "modify_vm reuse %1", p );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/include/evms_lib.ycp new/yast2-storage-2.14.6/storage/src/include/evms_lib.ycp
--- old/yast2-storage-2.14.5/storage/src/include/evms_lib.ycp 2006-08-07 13:20:13.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/include/evms_lib.ycp 2006-09-20 12:26:33.000000000 +0200
@@ -11,7 +11,7 @@
* Thomas Fehr
*
*
- * $Id: evms_lib.ycp 32189 2006-08-07 11:21:35Z fehr $
+ * $Id: evms_lib.ycp 33002 2006-09-20 10:28:09Z fehr $
*
*/
@@ -1206,7 +1206,7 @@
map ret = $[ "ok" : false ];
map part =
$[ "create" : true,
- "used_fs" : Partitions::default_fs,
+ "used_fs" : Partitions::DefaultFs(),
"stripes" : 1,
"format" : true,
"type" : `evms,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/include/partition_defines.ycp new/yast2-storage-2.14.6/storage/src/include/partition_defines.ycp
--- old/yast2-storage-2.14.5/storage/src/include/partition_defines.ycp 2006-09-18 19:48:20.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/include/partition_defines.ycp 2006-09-21 13:11:58.000000000 +0200
@@ -12,7 +12,7 @@
* mike
*
*
- * $Id: partition_defines.ycp 32957 2006-09-18 17:49:54Z fehr $
+ * $Id: partition_defines.ycp 33024 2006-09-21 11:13:35Z fehr $
*
*/
@@ -213,65 +213,6 @@
};
- define list convertFsOptionMapInList(map partition ) ``{
-
- map fs_options = partition["fs_options"]:$[];
- list all_options = [];
-
- // do nothing
- if( ! partition["format"]:false || fs_options == nil || fs_options == $[] )
- {
- return [];
- //partition = add( partition, "fs_options" , [] );
- //return partition;
- }
-
- list ignore = [ "auto", "default", "none", "" ];
-
- foreach(any option_key, map option, fs_options , ``{
-
- string option_str = option["option_str"]:"";
- any option_value = option["option_value"]:"";
- boolean option_blank = option["option_blank"]:false;
-
- if( is( option_value, string) && option_value != nil )
- {
- if( ! contains( ignore, option_value ))
- {
- if( option_blank )
- {
- all_options = add( all_options, option_str);
- all_options = add( all_options, option_value);
- }
- else
- all_options = add( all_options , option_str + (string) option_value);
- }
- }
- else if ( is( option_value, boolean) && option_value != nil )
- {
- if( (boolean) option_value )
- all_options = add( all_options , option_str );
- }
- else if ( is( option_value, integer) && option_value != nil )
- {
- if( option_blank )
- {
- all_options = add( all_options, option_str);
- all_options = add( all_options, sformat("%1", option_value));
- }
- else
- all_options = add( all_options , option_str + sformat("%1", option_value));
- }
- });
-
- //partition = add( partition, "fs_options" , all_options);
- //return partition;
- y2milestone( "convertFsOptionMapInList ret: %1", all_options );
- return all_options;
- };
-
-
-
/**
* Make a proposal for a Mountpoint
* @parm targetMap all targets
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/include/raid_ui.ycp new/yast2-storage-2.14.6/storage/src/include/raid_ui.ycp
--- old/yast2-storage-2.14.5/storage/src/include/raid_ui.ycp 2006-08-07 13:20:13.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/include/raid_ui.ycp 2006-09-20 12:26:33.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Michael Hager
*
- * $Id: raid_ui.ycp 32189 2006-08-07 11:21:35Z fehr $
+ * $Id: raid_ui.ycp 33002 2006-09-20 10:28:09Z fehr $
*
* All user interface functions for RAID.
*
@@ -357,7 +357,7 @@
"fsid" : Partitions::fsid_native,
"size_k" : 0, // dummy
"create" : true,
- "used_fs" : Partitions::default_fs ];
+ "used_fs" : Partitions::DefaultFs() ];
map p = $[];
foreach( string device, (list<string>)at[i]:[],
``{
@@ -502,7 +502,7 @@
if( raidp == $[] || what == `settings )
{
string mprop = GetMountPointProposal( tg, [] );
- symbol used_fs = Partitions::default_fs;
+ symbol used_fs = Partitions::DefaultFs();
if( mprop == Partitions::BootMount() )
{
used_fs = Partitions::DefaultBootFs();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/inst_custom_part.ycp new/yast2-storage-2.14.6/storage/src/inst_custom_part.ycp
--- old/yast2-storage-2.14.5/storage/src/inst_custom_part.ycp 2006-09-18 19:48:20.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/inst_custom_part.ycp 2006-09-20 12:26:33.000000000 +0200
@@ -26,7 +26,7 @@
*
*************************************************************
- $Id: inst_custom_part.ycp 32957 2006-09-18 17:49:54Z fehr $
+ $Id: inst_custom_part.ycp 33002 2006-09-20 10:28:09Z fehr $
*/
{
@@ -78,6 +78,9 @@
boolean showT_udev_id = true; // show persistent id
boolean showT_udev_path = true; // show persistent path
+ // hide some details in the table by default
+ boolean show_T_details = Storage::GetExpertDetail();
+
boolean show_disk = true;
boolean edit_cylinder = true;
boolean bsd_label = false;
@@ -1021,14 +1024,14 @@
if( showT_format ) a = add(a, (disk["dasdfmt"]:false)?"X":" " );
if( showT_fs ) a = add(a, vendor);
if( showT_mount ) a = add(a, "" );
- if( showT_mby ) a = add(a, "");
- if( showT_cyl ) a = add(a, dev_start_cyl );
- if( showT_cyl ) a = add(a, dev_nb_cyl );
+ if( show_T_details && showT_mby ) a = add(a, "");
+ if( show_T_details && showT_cyl ) a = add(a, dev_start_cyl );
+ if( show_T_details && showT_cyl ) a = add(a, dev_nb_cyl );
if( showT_Used ) a = add(a, usedByString( disk["used_by_type"]:`UB_NONE,
disk["used_by"]:"" ));
if( showT_Label ) a = add(a, "");
- if( showT_udev_id ) a = add(a, udev_id);
- if( showT_udev_path ) a = add(a, udev_path);
+ if( show_T_details && showT_udev_id ) a = add(a, udev_id);
+ if( show_T_details && showT_udev_path ) a = add(a, udev_path);
table_input = add( table_input, a );
}
@@ -1135,7 +1138,7 @@
}
a = add(a, tmp );
}
- if( showT_mby )
+ if( show_T_details && showT_mby )
{
if (size (mount_point) > 0)
{
@@ -1146,7 +1149,7 @@
else
a = add(a, "");
}
- if( showT_cyl )
+ if( show_T_details && showT_cyl )
{
if( real_disk )
{
@@ -1164,8 +1167,9 @@
}
if( showT_Used ) a = add(a, used_by);
if( showT_Label ) a = add(a, label);
- if( showT_udev_id ) a = add(a, udev_id);
- if( showT_udev_path ) a = add(a, udev_path);
+
+ if( show_T_details && showT_udev_id ) a = add(a, udev_id);
+ if( show_T_details && showT_udev_path ) a = add(a, udev_path);
table_input = add( table_input, a );
}
@@ -2371,6 +2375,53 @@
return( "---" );
};
+define term GetTableHeader () {
+ term header = `header();
+
+ // Column header
+ if ( showT_dev ) header = add( header, _("Device"));
+
+ // Column header
+ if ( showT_id ) header = add( header, _("ID"));
+
+ // Column header: centered / minimum = 11 characters /
+ // fill with space if needed
+ if ( showT_size ) header = add( header, `Right(_(" Size ")));
+
+ // Column header: centered / minimum = 3 characters /
+ // fill with space if needed
+ if ( showT_format ) header = add( header, `Right(_(" F ")));
+
+ // Column header
+ if ( showT_fs ) header = add( header, _("Type"));
+
+ // Column header: centered / minimum = 7 characters /
+ // fill with space if needed
+ if ( showT_mount ) header = add( header, _(" Mount "));
+
+ // Column header
+ if ( show_T_details && showT_mby ) header = add( header, _("Mount By"));
+
+ // Column header: minimum = 5 characters fill with space if needed
+ if ( show_T_details && showT_cyl ) header = add( header, `Right(_("Start")));
+
+ // Column header: minimum = 4 characters fill with space if needed
+ if ( show_T_details && showT_cyl ) header = add( header, `Right(_("End ")));
+
+ // Column header
+ if ( showT_Used ) header = add( header, `Left(_("Used By")));
+
+ // Column header
+ if ( showT_Label ) header = add( header, `Left(_("Label")));
+
+ // Column header
+ if ( show_T_details && showT_udev_id ) header = add( header, `Left(_("Device ID")));
+
+ // Column header
+ if ( show_T_details && showT_udev_path ) header = add( header, `Left(_("Device Path")));
+
+ return header;
+}
/*---------------------------------------------------------------------
* Make a output string for "you can not create a partition, because: "
@@ -2397,7 +2448,7 @@
pri_line = _("A primary partition can be created.\n");
else
// complete sentence. gets combined with other sentences.
- pri_line = _("A primary partition cannot be created.") +
+ pri_line = _("A primary partition cannot be created.") + " " +
FormatCauseLine( no_primary_cause ) + "\n";
if( logical_is_possible )
@@ -2406,7 +2457,7 @@
else
if( no_logical_cause != `impossible )
// complete sentence. gets combined with other sentences.
- log_line = _("A logical partition cannot be created.") +
+ log_line = _("A logical partition cannot be created.") + " " +
FormatCauseLine( no_logical_cause ) +"\n" ;
if ( extended_is_possible )
@@ -2415,7 +2466,7 @@
else
if( no_logical_cause != `impossible )
// complete sentence. gets combined with other sentences.
- ext_line = _("An extended partition cannot be created.") +
+ ext_line = _("An extended partition cannot be created.") + " " +
FormatCauseLine( no_extended_cause ) +"\n";
return ( pri_line + ext_line + log_line );
@@ -2445,37 +2496,7 @@
/////////////////////////////////////////////////////////////////
/// MAIN DIALOG
- term header = `header();
- // Column header
- if ( showT_dev ) header = add( header, _("Device"));
- // Column header
- if ( showT_id ) header = add( header, _("ID"));
- // Column header: centered / minimum = 11 characters /
- // fill with space if needed
- if ( showT_size ) header = add( header, `Right(_(" Size ")));
- // Column header: centered / minimum = 3 characters /
- // fill with space if needed
- if ( showT_format ) header = add( header, `Right(_(" F ")));
- // Column header
- if ( showT_fs ) header = add( header, _("Type"));
- // Column header: centered / minimum = 7 characters /
- // fill with space if needed
- if ( showT_mount ) header = add( header, _(" Mount "));
- // Column header
- if ( showT_mby ) header = add( header, _("Mount By"));
- // Column header: minimum = 5 characters fill with space if needed
- if ( showT_cyl ) header = add( header, `Right(_("Start")));
- // Column header: minimum = 4 characters fill with space if needed
- if ( showT_cyl ) header = add( header, `Right(_("End ")));
- // Column header
- if ( showT_Used ) header = add( header, `Left(_("Used By")));
- // Column header
- if ( showT_Label ) header = add( header, `Left(_("Label")));
- // Column header
- if ( showT_udev_id ) header = add( header, `Left(_("Device ID")));
- // Column header
- if ( showT_udev_path ) header = add( header, `Left(_("Device Path")));
/////////////////////////////////////////////////////////////////
// MAIN LAYOUT
@@ -2564,12 +2585,18 @@
add( buttonline_b, `MenuButton ( _("E&xpert.."), expert_item_list ));
-
-
+ // check box
+ term details_checkbox = `Left (
+ `CheckBox (`id(`show_table_details), `opt(`notify), _("&Show Details"), show_T_details)
+ );
term contents = `VBox( `VSpacing(0.5),
- `Table( `id(`table), `opt(`notify,`keepSorting),
- header, table_list ),
+ `ReplacePoint(
+ `id(`table_rp),
+ `Table( `id(`table), `opt(`notify,`keepSorting),
+ GetTableHeader(), table_list )
+ ),
+ details_checkbox,
buttonline_a,
buttonline_b ) ;
@@ -2580,7 +2607,7 @@
}
else
{
- help_text = getMainHelptext(Stage::initial ());
+ help_text = getMainHelptext(Stage::initial());
}
// Main dialog: Header
@@ -2634,11 +2661,20 @@
y2milestone( "USERINPUT: %1", ret);
+ if( ret==`show_table_details )
+ {
+ show_T_details = (boolean) UI::QueryWidget(`id(`show_table_details), `Value);
+ UI::ReplaceWidget( `id(`table_rp),
+ `Table( `id(`table), `opt(`notify,`keepSorting),
+ GetTableHeader(), [] ));
+ continue;
+ }
+
/////////////////////////////////////////////////////////////
//// CREATE
/////////////////////////////////////////////////////////////
- if( ret == `create)
+ else if( ret == `create)
{
string ddev = ChooseDisk( tg,
// popup text
@@ -2836,7 +2872,7 @@
{
string mount_point_proposal =
GetMountPointProposal( Storage::GetTargetMap(), [] );
- symbol used_fs = Partitions::default_fs;
+ symbol used_fs = Partitions::DefaultFs();
if( mount_point_proposal == Partitions::BootMount() )
{
used_fs = Partitions::DefaultBootFs();
@@ -3513,6 +3549,10 @@
Wizard::RestoreBackButton();
}
+ Storage::SetExpertDetail( show_T_details );
+ Storage::SaveExpertDetail();
+
+
Wizard::RestoreHelp( help_text );
SCR::Write(.target.ycp, Storage::SaveDumpPath("targetMap_e"),
Storage::GetTargetMap() );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/inst_lvm_lv.ycp new/yast2-storage-2.14.6/storage/src/inst_lvm_lv.ycp
--- old/yast2-storage-2.14.5/storage/src/inst_lvm_lv.ycp 2006-04-11 15:12:35.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/inst_lvm_lv.ycp 2006-09-20 12:26:33.000000000 +0200
@@ -10,7 +10,7 @@
* Authors:
* mike
*
- * $Id: inst_lvm_lv.ycp 29983 2006-04-11 13:12:27Z fehr $
+ * $Id: inst_lvm_lv.ycp 33002 2006-09-20 10:28:09Z fehr $
*
*
*----------------------------------------------------
@@ -185,7 +185,7 @@
{
map Lv = $[
"create" : true,
- "used_fs" : `reiser,
+ "used_fs" : Partitions::DefaultFs(),
"type" : `lvm,
"size_k" : max_size/4/pesize*pesize/1024,
"stripes" : 1,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/inst_part_proposal.ycp new/yast2-storage-2.14.6/storage/src/inst_part_proposal.ycp
--- old/yast2-storage-2.14.5/storage/src/inst_part_proposal.ycp 2006-09-18 19:48:20.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/inst_part_proposal.ycp 2006-09-19 13:11:51.000000000 +0200
@@ -17,7 +17,7 @@
*
*************************************************************
- $Id: inst_part_proposal.ycp 32957 2006-09-18 17:49:54Z fehr $
+ $Id: inst_part_proposal.ycp 32967 2006-09-19 11:13:25Z fehr $
*/
@@ -221,7 +221,7 @@
Wizard::SetContents( title, contents, help_text,
(boolean)WFM::Args(0), (boolean)WFM::Args(1) );
if ( Stage::initial () )
- Wizard::SetTitleIcon( "partitioner" );
+ Wizard::SetTitleIcon( "yast-partitioning" );
}
repeat
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/inst_target_selection.ycp new/yast2-storage-2.14.6/storage/src/inst_target_selection.ycp
--- old/yast2-storage-2.14.5/storage/src/inst_target_selection.ycp 2006-09-05 18:41:26.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/inst_target_selection.ycp 2006-09-19 13:11:51.000000000 +0200
@@ -12,7 +12,7 @@
* "target_is":<devicename> (key to "targets" map)
* if custom, set "target_is":"CUSTOM"
*
- * $Id: inst_target_selection.ycp 32707 2006-09-05 16:42:51Z fehr $
+ * $Id: inst_target_selection.ycp 32967 2006-09-19 11:13:25Z fehr $
*/
{
textdomain "storage";
@@ -169,7 +169,7 @@
contents, helptext, (boolean)WFM::Args(0),
(boolean)WFM::Args(1));
if ( Stage::initial () )
- Wizard::SetTitleIcon( "idetune" );
+ Wizard::SetTitleIcon( "yast-partitioning" );
if( UI::WidgetExists( `id(`disklist)) && !custom_val )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/modules/FileSystems.ycp new/yast2-storage-2.14.6/storage/src/modules/FileSystems.ycp
--- old/yast2-storage-2.14.5/storage/src/modules/FileSystems.ycp 2006-08-07 13:20:13.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/modules/FileSystems.ycp 2006-09-21 13:11:58.000000000 +0200
@@ -7,7 +7,7 @@
* These module contains the supported filesystems and their settings.
*
*
- * $Id: FileSystems.ycp 32189 2006-08-07 11:21:35Z fehr $
+ * $Id: FileSystems.ycp 33024 2006-09-21 11:13:35Z fehr $
*/
{
module "FileSystems";
@@ -587,6 +587,17 @@
// help text, richtext format
`help_text : _("<p><b>Inode Size:</b>
This option specifies the inode size of the file system.</p>\n")
+ ],
+ $[
+ // label text
+ `widget : `CheckBox(`id("opt_dir_index"), `opt(`hstretch), _("&Directory Index Feature")),
+ `query_key : "opt_dir_index",
+ `option_str : "-O dir_index",
+ `type : `boolean,
+ `default : false,
+ // help text, richtext format
+ `help_text : _("<p><b>Directoy Index:</b>
+Enables use of hashed b-trees to speed up lookups in large directories.</p>\n")
]
];
@@ -1328,6 +1339,28 @@
return( fst_default );
}
+global define map DefaultFormatOptions( map part )
+ ``{
+ map ret = $[];
+ symbol fsys = part["used_fs"]:`none;
+ if( part["format"]:false )
+ {
+ if( fsys==`ext3 )
+ {
+ ret["opt_dir_index"] = $[ "option_str":"-O dir_index",
+ "option_value":true ];
+ }
+ if( Arch::s390() && contains( [`ext2, `ext3, `xfs, `reiser], fsys ) )
+ {
+ ret["opt_blocksize"] = $[ "option_str":"-b",
+ "option_value":"4096" ];
+ }
+ }
+ y2milestone( "DefaultFormatOptions fsys %1 fmt %2 is %3", fsys,
+ part["format"]:false, ret );
+ return( ret );
+ }
+
global define boolean HasFstabOption( map part, string opt, boolean prefix )
{
list<string> l = splitstring( part["fstopt"]:"", "," );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/modules/Partitions.ycp new/yast2-storage-2.14.6/storage/src/modules/Partitions.ycp
--- old/yast2-storage-2.14.5/storage/src/modules/Partitions.ycp 2006-09-05 18:41:26.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/modules/Partitions.ycp 2006-09-20 12:26:33.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Provides information about partitions
*
- * $Id: Partitions.ycp 32707 2006-09-05 16:42:51Z fehr $
+ * $Id: Partitions.ycp 33002 2006-09-20 10:28:09Z fehr $
*/
{
module "Partitions";
@@ -79,7 +79,7 @@
global integer minimal_needed_disksize = 400 * 1024 * 1024; // for installation of a minimal system
integer minimal_needed_bootsize = 0;
- global symbol default_fs = `reiser;
+ symbol default_fs = `unknown;
symbol default_boot_fs = `unknown;
global list<string> not_shown_partitions =
@@ -100,6 +100,15 @@
return ;
}
+global define symbol DefaultFs()
+ ``{
+ if( default_fs == `unknown )
+ {
+ default_fs = `reiser;
+ }
+ return( default_fs );
+ }
+
global define symbol DefaultBootFs()
``{
if( default_boot_fs == `unknown )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.14.5/storage/src/modules/Storage.ycp new/yast2-storage-2.14.6/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.14.5/storage/src/modules/Storage.ycp 2006-09-18 19:48:20.000000000 +0200
+++ new/yast2-storage-2.14.6/storage/src/modules/Storage.ycp 2006-09-21 13:11:58.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 32957 2006-09-18 17:49:54Z fehr $
+ * $Id: Storage.ycp 33024 2006-09-21 11:13:35Z fehr $
*/
{
@@ -853,6 +853,117 @@
return( target );
}
+define string convertFsOptionMapToString( map fsopt )
+ {
+ string ret = "";
+
+ // do nothing
+ if( fsopt != nil || fsopt != $[] )
+ {
+ list ignore = [ "auto", "default", "none", "" ];
+
+ foreach(any option_key, map option, fsopt,
+ ``{
+ string option_str = option["option_str"]:"";
+ any option_value = option["option_value"]:(any)"";
+ boolean option_blank = option["option_blank"]:false;
+ y2milestone( "convertFsOptionMapToString k:%1 opt:%2 val:%3",
+ option_key, option, option_value );
+
+ if( is(option_value, string) && option_value != nil )
+ {
+ if( !contains( ignore, option_value ))
+ {
+ if( size(ret)>0 )
+ ret = ret + " ";
+ ret = ret + option_str;
+ if( option_blank )
+ ret = ret + " ";
+ ret = ret + (string)option_value;
+ }
+ }
+ else if( is(option_value, boolean) && option_value != nil )
+ {
+ if( (boolean) option_value )
+ {
+ if( size(ret)>0 )
+ ret = ret + " ";
+ ret = ret + option_str;
+ }
+ }
+ else if( is(option_value, integer) && option_value != nil )
+ {
+ if( size(ret)>0 )
+ ret = ret + " ";
+ ret = ret + option_str;
+ if( option_blank )
+ ret = ret + " ";
+ ret = ret + sformat("%1", option_value);
+ }
+ });
+ }
+ if( size(fsopt)>0 || size(ret)>0 )
+ y2milestone( "convertFsOptionMapToString fsopt:%1 ret:%2", fsopt, ret );
+ return ret;
+ };
+
+map convertStringToFsOptionMap( string opts, symbol fs )
+ {
+ map ret = $[];
+ y2milestone( "convertStringToFsOptionMap opts:\"%1\" fs:%2", opts, fs );
+ integer pos = findfirstnotof( opts, " \t" );
+ if( pos>0 )
+ opts = substring( opts, pos );
+ list<map> op = (list<map>)FileSystems::GetOptions(fs);
+ while( size(opts)>0 )
+ {
+ boolean found = false;
+ foreach( map o, op,
+ ``{
+ map m = $[];
+ string os = o[`option_str]:"";
+ if( !found && size(os)>0 && search( opts, os )==0 )
+ {
+ found = true;
+ m["option_str"] = os;
+ if( o[`type]:`text==`boolean )
+ {
+ m["option_value"] = true;
+ ret[o[`query_key]:""] = m;
+ }
+ opts = substring( opts, size(os) );
+ pos = findfirstnotof( opts, " \t" );
+ if( pos>0 )
+ opts = substring( opts, pos );
+ if( o[`type]:`text!=`boolean && size(opts)>0 &&
+ search(opts,"-")!=0 )
+ {
+ if( pos>0 )
+ m["option_blank"] = true;
+ pos = findfirstof( opts, " \t" );
+ if( pos==nil )
+ {
+ m["option_value"] = opts;
+ opts = "";
+ }
+ else
+ {
+ m["option_value"] = substring( opts, 0, pos );
+ opts = substring( opts, pos );
+ }
+ ret[o[`query_key]:""] = m;
+ }
+ pos = findfirstnotof( opts, " \t" );
+ if( pos>0 )
+ opts = substring( opts, pos );
+ }
+ });
+ y2milestone( "convertStringToFsOptionMap opts:%1 ret:%2", opts, ret );
+ }
+ y2milestone( "convertStringToFsOptionMap ret:%1", ret );
+ return( ret );
+ }
+
symbol toSymbol( map conv, integer val )
{
return( conv["m",val]:(conv["def_sym"]:`invalid_conv_map) );
@@ -960,7 +1071,16 @@
}
tmp = LibStorage::VolumeInfo::swig_mkfs_options_get(vinfo);
if( size(tmp)>0 )
+ {
p["mkfs_opt"] = tmp;
+ p["fs_options"] =
+ convertStringToFsOptionMap( tmp, p["detected_fs"]:`unknown );
+ }
+ else
+ {
+ if( haskey( p, "fs_options" ))
+ p = remove( p, "fs_options" );
+ }
tmp = LibStorage::VolumeInfo::swig_uuid_get(vinfo);
if( size(tmp)>0 )
p["uuid"] = tmp;
@@ -2166,12 +2286,13 @@
else
y2milestone( "ChangeVolumeProperties sint ret:%1", ret );
}
- if( ret==0 &&
- part["format"]:false && part["mkfs_opt"]:"" != curr["mkfs_opt"]:"" )
+ if( ret==0 && part["format"]:false &&
+ convertFsOptionMapToString(part["fs_options"]:$[]) != curr["mkfs_opt"]:"" )
{
changed = true;
- ts = part["mkfs_opt"]:"";
- ret = LibStorage::StorageInterface::changeLabelVolume( sint, dev, ts );
+ ts = convertFsOptionMapToString(part["fs_options"]:$[]);
+ y2milestone( "FsOption ts:%1", ts );
+ ret = LibStorage::StorageInterface::changeMkfsOptVolume( sint, dev, ts );
if( ret<0 )
y2error( "ChangeVolumeProperties sint ret:%1", ret );
else
@@ -5235,7 +5356,7 @@
global define integer NumLoopDevices()
{
- map bo = (map)SCR::Execute (.target.bash_output, "losetup -a" );
+ map bo = (map)WFM::Execute (.local.bash_output, "losetup -a" );
list<string> sl = splitstring( bo["stdout"]:"", "\n" );
sl = filter( string s, sl, ``(search( s, "/dev/loop" )==0 ));
sl = maplist( string s, sl, ``(substring( s, 0, search( s, ":" ))));
@@ -5360,8 +5481,7 @@
{
return $[]; // unknown type
}
- if( part["detected_fs"]:`reiserfs == `unknown ||
- part["noauto"]:false )
+ if( part["detected_fs"]:`unknown == `unknown || part["noauto"]:false )
{
passno = 0;
}
@@ -5655,4 +5775,63 @@
return( no_propose_disks );
}
+boolean expert_detail = nil;
+path ed_path = .sysconfig.storage.EXPERT_DETAIL;
+
+list FindExpertLine( map file )
+ {
+ list ret = [];
+ list<list> t = maplist( integer k, map e, file["l"]:$[],
+ ``([k, e["line"]:""]));
+ t = filter( list e, t, ``(search(e[1]:"","EXPERT_DETAIL")==0));
+ y2milestone( "FindExpertLine t:%1", t );
+ ret = t[0]:[];
+ y2milestone( "FindExpertLine ret:%1", ret );
+ return( ret );
+ }
+
+global boolean GetExpertDetail()
+ {
+ if( expert_detail==nil )
+ {
+ map file = $[];
+ AsciiFile::ReadFile( file, "/etc/sysconfig/storage" );
+ y2milestone( "GetExpertDetail file:%1", file );
+ list l = FindExpertLine( file );
+ y2milestone( "GetExpertDetail l:%1", l );
+ l = filter( string s, splitstring( l[1]:"", "= " ), ``(size(s)>0));
+ y2milestone( "GetExpertDetail l:%1", l );
+ if( tointeger(l[1]:"0")==0 )
+ expert_detail=false;
+ else
+ expert_detail=true;
+ }
+ y2milestone( "GetExpertDetail ret:%1", expert_detail );
+ return( expert_detail );
+ }
+
+global void SetExpertDetail( boolean val )
+ {
+ y2milestone( "SetExpertDetail val:%1", val );
+ expert_detail = val;
+ }
+
+global boolean SaveExpertDetail()
+ {
+ y2milestone( "SaveExpertDetail val:%1", expert_detail );
+ if( expert_detail!=nil )
+ {
+ map file = $[];
+ AsciiFile::ReadFile( file, "/etc/sysconfig/storage" );
+ list l = FindExpertLine( file );
+ string e = "EXPERT_DETAIL=" + (expert_detail?"1":"0");
+ integer lineno = l[0]:(size(file["l"]:$[]) + 1);
+ if( size(l)==0 )
+ file["l",lineno] = $[];
+ file["l",lineno,"line"] = e;
+ file["l",lineno,"changed"] = true;
+ AsciiFile::RewriteFile( file, "/etc/sysconfig/storage" );
+ }
+ }
+
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org