summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-12-22 09:48:22 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-12-22 09:48:22 -0800
commitecbe578aef6b4ce5b1d26f82df739ba61d3acfed (patch)
tree065cb6cb7d50e9d2d198699e956b022e8c24b1ab /Makefile.am
parent44e61ea3a1847eb7b8b39d87c20de9e2e8a0815d (diff)
downloadvyatta-cfg-ecbe578aef6b4ce5b1d26f82df739ba61d3acfed.tar.gz
vyatta-cfg-ecbe578aef6b4ce5b1d26f82df739ba61d3acfed.zip
Revert "Workaround issues with floppy formatting on some VM and hardware"
This reverts commit ba1376cd853e6b48cd3c6d32a71e5bb6672c3ff9. Conflicts: Makefile.am
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 1 insertions, 2 deletions
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
+