Author: fehr Date: Wed Oct 5 17:24:56 2011 New Revision: 66274 URL: http://svn.opensuse.org/viewcvs/yast?rev=66274&view=rev Log: remove options "users,gid=users" from vfat fstab options for /boot (bnc#722299) Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storag... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Wed Oct 5 17:24:56 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 5 16:50:39 CEST 2011 - fehr@suse.de + +- remove options "users,gid=users" from vfat fstab options for + /boot (bnc#722299) + +------------------------------------------------------------------- Mon Sep 19 12:18:31 CEST 2011 - fehr@suse.de - fix bug that prevent mounting by-id and by-path for BTRFS volumes Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storag... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/FileSystems.ycp Wed Oct 5 17:24:56 2011 @@ -1310,7 +1310,9 @@ } else if( !Arch::ia64() && contains( [`vfat, `ntfs], fsys ) ) { - fst_default = "users,gid=users"; + fst_default = ""; + if( substring(part["mount"]:"",0,5)!="/boot" ) + fst_default = "users,gid=users"; string enc = LangTypicalEncoding(); string code = Encoding::GetCodePage(enc); if( size(enc)>0 ) @@ -1361,6 +1363,8 @@ } } + if( substring(fst_default,0,1)=="," ) + fst_default = substring(fst_default,1); y2milestone( "DefaultFstabOptions dev %3 fsys %1 is %2", fsys, fst_default, dev ); return( fst_default ); } Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storag... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Wed Oct 5 17:24:56 2011 @@ -3367,8 +3367,9 @@ ((partnum<=max_prim)==primary) && foreign_nr < 24 && Partitions::IsDosWinNtPartition(fsid) && - (!Arch::ia64() || (!IsEfiPartition(partition) && - partition["size_k"]:0 >= 1024*1024)) && + !Arch::ia64() && + !IsEfiPartition(partition) && + partition["size_k"]:0 >= 1024*1024 && contains( [`vfat, `ntfs], partition["used_fs"]:`none )) { new_partition["fstopt"] = -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org