Author: fehr Date: Wed Dec 12 12:15:07 2007 New Revision: 43014 URL: http://svn.opensuse.org/viewcvs/yast?rev=43014&view=rev Log: do not create fstab entries for floppy drives (#344483) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=43014&r1=43013&r2=43014&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Dec 12 12:15:07 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 12 12:13:37 CET 2007 - fehr@suse.de + +- do not create fstab entries for floppy drives (#344483) + +------------------------------------------------------------------- Tue Dec 11 12:09:26 CET 2007 - fehr@suse.de - require pam_mount to be installed when encryption is used (#345177) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=43014&r1=43013&r2=43014&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Dec 12 12:15:07 2007 @@ -4668,18 +4668,6 @@ Storage::AddFstabEntry( m ); num = num+1; }); - num = 0; - foreach( map drive, StorageDevices::FloppyDrives(), - ``{ - m = FileSystems::GetFstabDefaultMap( "floppy" ); - string fdname = "/floppy"; - if( num > 0 ) - fdname = fdname + sformat( "%1", num ); - m["mount"] = "/media"+fdname; - m["spec"] = drive["dev_name"]:""; - Storage::AddFstabEntry( m ); - num = num+1; - }); if( BootEvms() ) UpdateBootFstabEvms(); HandleModulesOnBoot( GetTargetMap() ); @@ -4947,10 +4935,7 @@ map l = AsciiFile::GetLine( fstab, line ); if( search( l["fields",1]:"", "/media/floppy" )==0 ) { - AsciiFile::ChangeLineField( fstab, line, 2, "auto" ); - AsciiFile::ChangeLineField( fstab, line, 3, FileSystems::GetFstabDefaultMntops("floppy") ); - -// rem_lines = add( rem_lines, line ); + rem_lines = add( rem_lines, line ); } else if( search( l["fields",1]:"", "/media/cdrom" )==0 || search( l["fields",1]:"", "/media/dvd" )==0 || @@ -4968,6 +4953,7 @@ y2milestone( "UpdateFstabSubfs %1", rem_lines ); if( size(rem_lines)>0 ) { + rem_lines = sort(rem_lines); AsciiFile::RemoveLines( fstab, rem_lines ); } AsciiFile::RewriteFile( fstab, tabpath ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org