Author: fehr
Date: Mon Aug 6 14:02:14 2007
New Revision: 39990
URL: http://svn.opensuse.org/viewcvs/yast?rev=39990&view=rev
Log:
add locale option to ntfs-3g entries in fstab (#297607)
Modified:
trunk/storage/libstorage/src/Volume.cc
trunk/storage/package/yast2-storage.changes
trunk/storage/storage/src/modules/FileSystems.ycp
Modified: trunk/storage/libstorage/src/Volume.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=39990&r1=39989&r2=39990&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Volume.cc (original)
+++ trunk/storage/libstorage/src/Volume.cc Mon Aug 6 14:02:14 2007
@@ -2086,14 +2086,16 @@
cmdline += "-r ";
const char * ign_opt[] = { "defaults", "" };
const char * ign_beg[] = { "loop", "encryption=", "phash=",
- "itercountk=" };
+ "itercountk=", "" };
if( cont->getStorage()->instsys() )
- ign_opt[1] = "ro";
+ ign_opt[lengthof(ign_opt)-1] = "ro";
+ if( fsn=="ntfs" )
+ ign_beg[lengthof(ign_beg)-1] = "locale=";
list<string> l = splitString( fstab_opt, "," );
y2mil( "l before:" << l );
- for( unsigned i=0; ihttp://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=39990&r1=39989&r2=39990&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Mon Aug 6 14:02:14 2007
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Aug 6 14:00:13 CEST 2007 - fehr@suse.de
+
+- add locale option to ntfs-3g entries in fstab (#297607)
+
+-------------------------------------------------------------------
Thu Aug 2 16:34:43 CEST 2007 - fehr@suse.de
- allow mount-by-uuid for swap devices
Modified: trunk/storage/storage/src/modules/FileSystems.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileSystems.ycp?rev=39990&r1=39989&r2=39990&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/FileSystems.ycp (original)
+++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Aug 6 14:02:14 2007
@@ -1389,7 +1389,15 @@
fst_default = fst_default + ",iocharset=" + enc;
}
else
+ {
+ map m = (map)SCR::Execute( .target.bash_output, "locale | grep LC_CTYPE" );
+ list<string> sl = splitstring( m["stdout"]:"", "\n" );
+ sl = splitstring( sl[0]:"", "=" );
+ y2milestone( "DefaultFstabOptions sl %1", sl );
fst_default = fst_default + ",nls=" + enc;
+ if( size(sl[1]:"")>0 )
+ fst_default = fst_default + ",locale=" + deletechars(sl[1]:"", "\"" );
+ }
}
if( size(code)>0 && code != "437" && fsys!=`ntfs )
{
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
