summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--etc/modprobe.d/floppy.conf3
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 6de91c6..b766cba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,8 @@ completion_SCRIPTS = etc/bash_completion.d/20vyatta-cfg
initd_SCRIPTS = etc/init.d/vyatta-ofr
dhcphook_SCRIPTS = scripts/vyatta-dhclient-hook
modprobe_SCRIPTS = etc/modprobe.d/no-copybreak.conf
+modprobe_SCRIPTS += etc/modprobe.d/floppy.conf
+
lib_LTLIBRARIES = src/libvyatta-cfg.la
src_libvyatta_cfg_la_LIBADD = /usr/lib/libglib-2.0.la
@@ -78,4 +80,3 @@ 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
new file mode 100644
index 0000000..7995f43
--- /dev/null
+++ b/etc/modprobe.d/floppy.conf
@@ -0,0 +1,3 @@
+# Disable floppy DMA to workaround kernel bug in formatting
+# on some hardware/VM's
+options floppy floppy=nodma