Author: fehr Date: Thu Jun 14 16:47:30 2007 New Revision: 38462 URL: http://svn.opensuse.org/viewcvs/yast?rev=38462&view=rev Log: use provided fstab options when mounting filesystems Modified: trunk/storage/libstorage/src/Volume.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=38462&r1=38461&r2=38462&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Thu Jun 14 16:47:30 2007 @@ -1983,6 +1983,7 @@ int Volume::mount( const string& m ) { + SystemCmd cmd; y2milestone( "device:%s mp:%s", dev.c_str(), m.c_str() ); string cmdline; @@ -2005,7 +2006,27 @@ cmdline += "-r "; else if( fs == FSUNKNOWN ) fsn = "auto"; - cmdline += "-t " + fsn + " " + mountDevice() + " " + lmount; + const char * ign_opt[] = { "defaults", "" }; + const char * ign_beg[] = { "loop", "encryption=", "phash=", + "itercountk=" }; + if( cont->getStorage()->instsys() ) + ign_opt[1] = "ro"; + list<string> l = splitString( fstab_opt, "," ); + y2mil( "l before:" << l ); + for( unsigned i=0; iflush(); } } + if( ret==0 && !format && mp==orig_mp && mp!="swap" ) + { + int r = umount( mp ); + y2mil( "remount umount:" << r ); + if( r==0 ) + { + ret = mount( mp ); + y2mil( "remount mount:" << ret ); + } + } y2milestone( "changed:%d ret:%d", changed, ret ); return( ret ); } Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=38462&r1=38461&r2=38462&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Jun 14 16:47:30 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jun 14 16:46:09 CEST 2007 - fehr@suse.de + +- use provided fstab options when mounting filesystems + +------------------------------------------------------------------- Wed Jun 6 13:56:50 CEST 2007 - fehr@suse.de - fix typos in translatable texts (#233645) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org