From ecbe578aef6b4ce5b1d26f82df739ba61d3acfed Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 22 Dec 2009 09:48:22 -0800 Subject: Revert "Workaround issues with floppy formatting on some VM and hardware" This reverts commit ba1376cd853e6b48cd3c6d32a71e5bb6672c3ff9. Conflicts: Makefile.am --- Makefile.am | 3 +-- etc/modprobe.d/floppy.conf | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 etc/modprobe.d/floppy.conf diff --git a/Makefile.am b/Makefile.am index 10286ff..25003d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,8 +14,6 @@ completion_SCRIPTS = etc/bash_completion.d/20vyatta-cfg initd_SCRIPTS = etc/init.d/vyatta-ofr dhcphook_SCRIPTS = scripts/vyatta-dhclient-hook modprobe_DATA = etc/modprobe.d/no-copybreak.conf -modprobe_DATA += etc/modprobe.d/floppy.conf - lib_LTLIBRARIES = src/libvyatta-cfg.la src_libvyatta_cfg_la_LIBADD = /usr/lib/libglib-2.0.la @@ -80,3 +78,4 @@ install-exec-hook: mkdir -p $(DESTDIR)$(etc_shell_leveldir) cd etc/shell/level; $(cpiop) $(DESTDIR)$(etc_shell_leveldir) cd $(DESTDIR)/opt/vyatta/sbin; ln -s my_commit2 my_commit + diff --git a/etc/modprobe.d/floppy.conf b/etc/modprobe.d/floppy.conf deleted file mode 100644 index 7995f43..0000000 --- a/etc/modprobe.d/floppy.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Disable floppy DMA to workaround kernel bug in formatting -# on some hardware/VM's -options floppy floppy=nodma -- cgit v1.2.3