[yast-commit] r57116 - in /branches/SuSE-SLE-10-SP3-Branch/storage: VERSION libstorage/src/Volume.cc package/yast2-storage.changes

Author: aschnell Date: Mon May 11 14:24:27 2009 New Revision: 57116 URL: http://svn.opensuse.org/viewcvs/yast?rev=57116&view=rev Log: - use provided fstab options when mounting filesystems (bnc #495530) Modified: branches/SuSE-SLE-10-SP3-Branch/storage/VERSION branches/SuSE-SLE-10-SP3-Branch/storage/libstorage/src/Volume.cc branches/SuSE-SLE-10-SP3-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-SLE-10-SP3-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/storage/VERSION?rev=57116&r1=57115&r2=57116&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/storage/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/storage/VERSION Mon May 11 14:24:27 2009 @@ -1 +1 @@ -2.13.105 +2.13.106 Modified: branches/SuSE-SLE-10-SP3-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/storage/libstorage/src/Volume.cc?rev=57116&r1=57115&r2=57116&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-SLE-10-SP3-Branch/storage/libstorage/src/Volume.cc Mon May 11 14:24:27 2009 @@ -1993,7 +1993,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: branches/SuSE-SLE-10-SP3-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/storage/package/yast2-storage.changes?rev=57116&r1=57115&r2=57116&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/storage/package/yast2-storage.changes Mon May 11 14:24:27 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 11 01:55:21 CEST 2009 - aschnell@suse.de + +- use provided fstab options when mounting filesystems (bnc + #495530) +- version 2.13.106 + +------------------------------------------------------------------- Fri Feb 13 16:51:26 CET 2009 - aschnell@suse.de - backported Storage::GetDefaultMountBy() (bnc #431418) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org