Mailinglist Archive: opensuse-commit (2129 mails)
| < Previous | Next > |
commit yast2-storage
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 10 Apr 2008 12:13:18 +0200
- Message-id: <20080410101319.4DBF1678185@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-storage
checked in at Thu Apr 10 12:13:18 CEST 2008.
--------
--- yast2-storage/yast2-storage.changes 2008-04-08 17:29:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes
2008-04-10 11:29:08.761982000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 09 19:21:25 CEST 2008 - aschnell@xxxxxxx
+
+- added checkbox to disable ext3 mount checks (fate #302118)
+- version 2.16.17
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.16.16.tar.bz2
New:
----
yast2-storage-2.16.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.u27876/_old 2008-04-10 12:13:08.000000000 +0200
+++ /var/tmp/diff_new_pack.u27876/_new 2008-04-10 12:13:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.16.16)
+# spec file for package yast2-storage (Version 2.16.17)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-storage
-Version: 2.16.16
+Version: 2.16.17
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.16.16.tar.bz2
+Source0: yast2-storage-2.16.17.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms evms-devel
gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel
swig update-desktop-files yast2 yast2-core-devel yast2-devtools
yast2-perl-bindings yast2-testsuite
Requires: parted yast2-storage-lib yast2-perl-bindings mdadm lvm2 dmraid
kpartx cryptsetup
@@ -51,7 +51,7 @@
Arvin Schnell <aschnell@xxxxxxx>
%prep
-%setup -n yast2-storage-2.16.16
+%setup -n yast2-storage-2.16.17
%build
%{prefix}/bin/y2tool y2autoconf
@@ -195,6 +195,9 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Wed Apr 09 2008 aschnell@xxxxxxx
+- added checkbox to disable ext3 mount checks (fate #302118)
+- version 2.16.17
* Tue Apr 08 2008 aschnell@xxxxxxx
- added filesystem label in one of the proposal screens
- version 2.16.16
++++++ yast2-storage-2.16.16.tar.bz2 -> yast2-storage-2.16.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-storage-2.16.16/configure
new/yast2-storage-2.16.17/configure
--- old/yast2-storage-2.16.16/configure 2008-04-08 17:18:00.000000000 +0200
+++ new/yast2-storage-2.16.17/configure 2008-04-10 11:28:37.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-storage 2.16.16.
+# Generated by GNU Autoconf 2.61 for yast2-storage 2.16.17.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.16.16'
-PACKAGE_STRING='yast2-storage 2.16.16'
+PACKAGE_VERSION='2.16.17'
+PACKAGE_STRING='yast2-storage 2.16.17'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1441,7 +1441,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-storage 2.16.16 to adapt to many kinds of
systems.
+\`configure' configures yast2-storage 2.16.17 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1512,7 +1512,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.16.16:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.16.17:";;
esac
cat <<\_ACEOF
@@ -1618,7 +1618,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.16.16
+yast2-storage configure 2.16.17
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1632,7 +1632,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-storage $as_me 2.16.16, which was
+It was created by yast2-storage $as_me 2.16.17, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2453,7 +2453,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.16.16'
+ VERSION='2.16.17'
cat >>confdefs.h <<_ACEOF
@@ -2681,7 +2681,7 @@
-VERSION="2.16.16"
+VERSION="2.16.17"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell <aschnell@xxxxxxx>"
@@ -21039,7 +21039,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-storage $as_me 2.16.16, which was
+This file was extended by yast2-storage $as_me 2.16.17, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21092,7 +21092,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-storage config.status 2.16.16
+yast2-storage config.status 2.16.17
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-storage-2.16.16/configure.in
new/yast2-storage-2.16.17/configure.in
--- old/yast2-storage-2.16.16/configure.in 2008-04-08 17:17:50.000000000
+0200
+++ new/yast2-storage-2.16.17/configure.in 2008-04-10 11:28:26.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.16.16, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.16.17, 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.16.16"
+VERSION="2.16.17"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell <aschnell@xxxxxxx>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-storage-2.16.16/libstorage/src/Volume.cc
new/yast2-storage-2.16.17/libstorage/src/Volume.cc
--- old/yast2-storage-2.16.16/libstorage/src/Volume.cc 2008-04-04
16:54:35.000000000 +0200
+++ new/yast2-storage-2.16.17/libstorage/src/Volume.cc 2008-04-09
19:35:19.000000000 +0200
@@ -822,6 +822,16 @@
ret = VOLUME_TUNE2FS_FAILED;
}
}
+ if( ret==0 && fs==REISERFS )
+ {
+ if (!tunefs_opt.empty())
+ {
+ string cmd = "/sbin/reiserfstune " + tunefs_opt + " " +
mountDevice();
+ SystemCmd c( cmd );
+ if( c.retcode()!=0 )
+ ret = VOLUME_TUNE2FS_FAILED;
+ }
+ }
if( ret==0 )
{
triggerUdevUpdate();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-storage-2.16.16/libstorage/testsuite/lvm_create.cc
new/yast2-storage-2.16.17/libstorage/testsuite/lvm_create.cc
--- old/yast2-storage-2.16.16/libstorage/testsuite/lvm_create.cc
2007-10-05 17:05:34.000000000 +0200
+++ new/yast2-storage-2.16.17/libstorage/testsuite/lvm_create.cc
2008-04-09 19:21:11.000000000 +0200
@@ -67,7 +67,7 @@
cout << s->createLvmVg( vg, 4, false, getDevs(disks) ) << endl;
/* create n logical volumes */
- int ret;
+ int ret = 0;
for ( int i = 0; i < n; i++ )
{
ostringstream name;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-storage-2.16.16/storage/src/include/custom_part_dialogs.ycp
new/yast2-storage-2.16.17/storage/src/include/custom_part_dialogs.ycp
--- old/yast2-storage-2.16.16/storage/src/include/custom_part_dialogs.ycp
2008-01-21 15:43:40.000000000 +0100
+++ new/yast2-storage-2.16.17/storage/src/include/custom_part_dialogs.ycp
2008-04-10 11:13:26.000000000 +0200
@@ -16,7 +16,7 @@
*
*************************************************************
- $Id: custom_part_dialogs.ycp 43636 2008-01-15 17:25:46Z fehr $
+ $Id: custom_part_dialogs.ycp 46324 2008-04-10 09:13:26Z aschnell $
*/
{
@@ -413,6 +413,7 @@
y2milestone( "FileSystemOptions query %1", query );
map<string,any> fs_option =
$[ "option_str" : entry[`option_str]:"",
+ "option_cmd" : entry[`option_cmd]:`mkfs,
"option_value" : query ];
y2milestone( "FileSystemOptions fs_option %1", fs_option );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-storage-2.16.16/storage/src/modules/FileSystems.ycp
new/yast2-storage-2.16.17/storage/src/modules/FileSystems.ycp
--- old/yast2-storage-2.16.16/storage/src/modules/FileSystems.ycp
2008-03-13 17:01:31.000000000 +0100
+++ new/yast2-storage-2.16.17/storage/src/modules/FileSystems.ycp
2008-04-10 11:13:26.000000000 +0200
@@ -7,7 +7,7 @@
* These module contains the supported filesystems and their settings.
*
*
- * $Id: FileSystems.ycp 43304 2008-01-07 12:05:32Z fehr $
+ * $Id: FileSystems.ycp 46324 2008-04-10 09:13:26Z aschnell $
*/
{
module "FileSystems";
@@ -608,6 +608,18 @@
// xgettext: no-c-format
// help text, richtext format
`help_text : _("<p><b>Percentage of blocks
reserved for root:</b> Specify the percentage of blocks reserved for the super
user. This value defaults to 5%.</p>")
+ ],
+ $[
+ // checkbox text
+ `widget :
`CheckBox(`id("opt_reg_checks"), `opt(`hstretch), _("Disable regular checks")),
+ `query_key : "opt_reg_checks",
+ `option_str : "-c 0 -i 0",
+ `option_cmd : `tunefs,
+ `type : `boolean,
+ `default : false,
+ // help text, richtext format
+ `help_text : _("<p><b>Disable regular
checks:</b>
+Disable regular file system check at booting.</p>\n")
]
];
@@ -1438,27 +1450,32 @@
return( fst_default );
}
-global define map DefaultFormatOptions( map part )
- ``{
+global 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 ];
- }
+ {
+ ret["opt_bytes_per_inode"] = $[ "option_str" : "-I",
+ "option_value" : "128" ];
+ ret["opt_dir_index"] = $[ "option_str" : "-O dir_index",
+ "option_value" : true ];
+ ret["opt_reg_checks"] = $[ "option_str" : "-c 0 -i 0",
+ "option_value" : true,
+ "option_cmd" : `tunefs ];
+ }
if( Arch::s390() && contains( [`ext2, `ext3], fsys ) )
- {
- ret["opt_blocksize"] = $[ "option_str":"-b",
- "option_value":"4096" ];
- }
+ {
+ ret["opt_blocksize"] = $[ "option_str" : "-b",
+ "option_value" : "4096" ];
}
+ }
y2milestone( "DefaultFormatOptions fsys %1 fmt %2 is %3", fsys,
part["format"]:false, ret );
- return( ret );
- }
+ return ret;
+}
global define boolean HasFstabOption( map part, string opt, boolean prefix )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-storage-2.16.16/storage/src/modules/Storage.ycp
new/yast2-storage-2.16.17/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.16.16/storage/src/modules/Storage.ycp 2008-03-26
17:22:18.000000000 +0100
+++ new/yast2-storage-2.16.17/storage/src/modules/Storage.ycp 2008-04-10
11:13:26.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 45762 2008-03-26 16:22:18Z aschnell $
+ * $Id: Storage.ycp 46324 2008-04-10 09:13:26Z aschnell $
*/
{
@@ -1076,7 +1076,7 @@
return( target );
}
-define string convertFsOptionMapToString( map<any,map> fsopt )
+string convertFsOptionMapToString( map<any, map> fsopt, symbol cmd )
{
string ret = "";
@@ -1090,9 +1090,12 @@
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 );
+ symbol option_cmd = option["option_cmd"]:`mkfs;
+ y2milestone( "convertFsOptionMapToString k:%1 opt:%2 val:%3 cmd:%4",
+ option_key, option, option_value, option_cmd );
+ if (cmd == option_cmd)
+ {
if( is(option_value, string) && option_value != nil )
{
if( !contains( ignore, option_value ))
@@ -1123,6 +1126,7 @@
ret = ret + " ";
ret = ret + sformat("%1", option_value);
}
+ }
});
}
if( size(fsopt)>0 || size(ret)>0 )
@@ -1130,14 +1134,17 @@
return ret;
};
-map convertStringToFsOptionMap( string opts, symbol fs )
+map<any, map> convertStringToFsOptionMap( string opts, symbol fs, symbol cmd )
{
- map ret = $[];
- y2milestone( "convertStringToFsOptionMap opts:\"%1\" fs:%2", opts, fs );
+ map<any, map> ret = $[];
+ y2milestone( "convertStringToFsOptionMap opts:\"%1\" fs:%2 cmd:%3", opts,
fs, cmd );
integer pos = findfirstnotof( opts, " \t" );
if( pos>0 )
opts = substring( opts, pos );
+
list<map> op = (list<map>)FileSystems::GetOptions(fs);
+ op = filter(map o, op, { return o[`option_cmd]:`mkfs == cmd; });
+
while( size(opts)>0 )
{
boolean found = false;
@@ -1148,7 +1155,8 @@
if( !found && size(os)>0 && search( opts, os )==0 )
{
found = true;
- m["option_str"] = os;
+ m["option_str"] = os;
+ m["option_cmd"] = o[`option_cmd]:`mkfs;
if( o[`type]:`text==`boolean )
{
m["option_value"] = true;
@@ -1309,13 +1317,20 @@
{
p["mkfs_opt"] = tmp;
p["fs_options"] =
- convertStringToFsOptionMap( tmp, p["detected_fs"]:`unknown );
+ convertStringToFsOptionMap( tmp, p["detected_fs"]:`unknown, `mkfs );
}
else
{
if( haskey( p, "fs_options" ))
p = remove( p, "fs_options" );
}
+ tmp = LibStorage::VolumeInfo::swig_tunefs_options_get(vinfo);
+ if( size(tmp)>0 )
+ {
+ p["tunefs_opt"] = tmp;
+ p["fs_options"] = union(p["fs_options"]:$[],
+ convertStringToFsOptionMap( tmp, p["detected_fs"]:`unknown, `tunefs
));
+ }
tmp = LibStorage::VolumeInfo::swig_dtxt_get(vinfo);
if( size(tmp)>0 )
p["dtxt"] = tmp;
@@ -2683,10 +2698,10 @@
y2milestone( "ChangeVolumeProperties sint ret:%1", ret );
}
if( ret==0 && part["format"]:false &&
- convertFsOptionMapToString(part["fs_options"]:$[]) !=
curr["mkfs_opt"]:"" )
+ convertFsOptionMapToString(part["fs_options"]:$[], `mkfs) !=
curr["mkfs_opt"]:"" )
{
changed = true;
- ts = convertFsOptionMapToString(part["fs_options"]:$[]);
+ ts = convertFsOptionMapToString(part["fs_options"]:$[], `mkfs);
y2milestone( "FsOption ts:%1", ts );
ret = LibStorage::StorageInterface::changeMkfsOptVolume( sint, dev, ts
);
if( ret<0 )
@@ -2694,6 +2709,18 @@
else
y2milestone( "ChangeVolumeProperties sint ret:%1", ret );
}
+ if( ret==0 && part["format"]:false &&
+ convertFsOptionMapToString(part["fs_options"]:$[], `tunefs) !=
curr["tunefs_opt"]:"" )
+ {
+ changed = true;
+ ts = convertFsOptionMapToString(part["fs_options"]:$[], `tunefs);
+ y2milestone( "FsOption ts:%1", ts );
+ ret = LibStorage::StorageInterface::changeTunefsOptVolume( sint, dev,
ts );
+ if( ret<0 )
+ y2error( "ChangeVolumeProperties sint ret:%1", ret );
+ else
+ y2milestone( "ChangeVolumeProperties sint ret:%1", ret );
+ }
if( ret==0 &&
part["enc_type"]:`none != `none && haskey( ClassifiedSettings, dev ) )
{
@@ -4035,7 +4062,7 @@
if( size(fs_opts)>0 )
ret["fs_options"] =
- convertStringToFsOptionMap( fs_opts, ret["used_fs"]:`unknown );
+ convertStringToFsOptionMap( fs_opts, ret["used_fs"]:`unknown, `mkfs
);
else
ret["fs_options"] = FileSystems::DefaultFormatOptions( ret );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-storage-2.16.16/VERSION
new/yast2-storage-2.16.17/VERSION
--- old/yast2-storage-2.16.16/VERSION 2008-04-08 17:13:29.000000000 +0200
+++ new/yast2-storage-2.16.17/VERSION 2008-04-09 19:21:15.000000000 +0200
@@ -1 +1 @@
-2.16.16
+2.16.17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |