Author: jreidinger Date: Wed Apr 29 15:16:18 2009 New Revision: 57034

URL: http://svn.opensuse.org/viewcvs/yast?rev=57034&view=rev Log: check usbfs only if system has usb and don't check floppy in fstab, as it is now obsolete (bnc#499208)

Modified: trunk/repair/package/yast2-repair.changes trunk/repair/src/OSRFstab.ycp

Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chang... ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Wed Apr 29 15:16:18 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 29 15:13:37 CEST 2009 - jreidinger@suse.cz + +- check for usbfs in fstab only if system has any usb (bnc#499208) +- don't check for floppy in fstab, as it is now obsolete + (bnc#499208) + +------------------------------------------------------------------- Wed Apr 29 14:12:07 CEST 2009 - jreidinger@suse.cz

- remove obsolete call which breaks bugzilla

Modified: trunk/repair/src/OSRFstab.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRFstab.ycp?rev=57034... ============================================================================== --- trunk/repair/src/OSRFstab.ycp (original) +++ trunk/repair/src/OSRFstab.ycp Wed Apr 29 15:16:18 2009 @@ -730,10 +730,11 @@ y2milestone ("it is a device used by other entity (e.g. LVM, EVMS, MD): ignoring"); return true; } - else if ("cdrom" == part["found"]:"") + else if ("cdrom" == part["found"]:"" + || "floppy" == part["found"]:"") { // bug #185575 - y2milestone ("cdrom/dvd entry (%1) should not be in fstab", p); + y2milestone ("cdrom/dvd/floppy entry (%1) should not be in fstab", p); return true; } map disk = Storage::GetDiskPartition (part["device"]:""); @@ -1035,11 +1036,15 @@ union ( union (checked_partitions, swapable_partition_list), [ - fstab_defaults ["usb", "spec"]:"", fstab_defaults ["proc", "spec"]:"", fstab_defaults ["pts", "spec"]:"", ] ); + + if (Hotplug::haveUSB){ + dev2check = add(dev2check, fstab_defaults ["usb", "spec"]:""); + } + dev2check = (list<string>) union (dev2check, maplist (map d, StorageDevices::cddrives(), ``(d["dev_orig"]:(d["dev_name"]:""))));