summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorrbays <rbays@ft1.vyatta.com>2008-05-19 21:22:58 -0700
committerrbays <rbays@ft1.vyatta.com>2008-05-19 21:22:58 -0700
commit2b5d8a35ce7deda1829b60bbfac46e26f530b014 (patch)
tree61f322fc9250a00b3c471ef690376bbb06667bd1 /Makefile.am
parent1265e545b75857785f933465c104aff9ec91fbd3 (diff)
parent5b160a324927a457c8ddbd90afada3523b189a43 (diff)
downloadvyatta-cfg-quagga-2b5d8a35ce7deda1829b60bbfac46e26f530b014.tar.gz
vyatta-cfg-quagga-2b5d8a35ce7deda1829b60bbfac46e26f530b014.zip
Merge branch 'hollywood' of http://git.vyatta.com/vyatta-cfg-system into hollywood
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 9e35f778..1af11a16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,7 @@ sysconf_DATA += sysconf/logrotate_messages
sysconf_DATA += sysconf/motd.tail
sysconf_DATA += sysconf/syslog.conf
sysconf_DATA += sysconf/default_ssh
+sysconf_DATA += sysconf/vyatta-sysctl.conf
libudev_SCRIPTS = scripts/vyatta_net_name
etcudev_DATA = sysconf/vyatta-net.rules