Author: snwint Date: Mon Aug 22 16:34:06 2011 New Revision: 65383 URL: http://svn.opensuse.org/viewcvs/yast?rev=65383&view=rev Log: - stop proposing to write to floppy Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes?rev=65383&r1=65382&r2=65383&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Mon Aug 22 16:34:06 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 22 16:33:09 CEST 2011 - snwint@suse.de + +- stop proposing to write to floppy + +------------------------------------------------------------------- Fri Aug 19 17:48:21 CEST 2011 - snwint@suse.de - change raid1 proposal to install only into mbr, not boot Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp?rev=65383&r1=65382&r2=65383&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Mon Aug 22 16:34:06 2011 @@ -1349,16 +1349,21 @@ */ global boolean InstallingToFloppy () { boolean ret = false; - if (loader_device == nil) + + y2milestone("InstallingToFloppy: loader_device = %1", loader_device); + + if (loader_device == nil || loader_device == "") ret = false; // bnc #180784 don't install to bootloader to floppy if ppc - if (getLoaderType (false) == "ppc") + else if (getLoaderType (false) == "ppc") ret = false; else if (loader_device == StorageDevices::FloppyDevice()) ret = true; else if (contains (getFloppyDevices (), loader_device)) ret = true; + y2milestone ("Installing to floppy: %1", ret); + return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org