diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2010-10-26 14:48:22 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2010-10-26 14:48:22 -0700 |
| commit | 40461ef6ea9325b0dd1262cd3b99ffcbcf69dfd6 (patch) | |
| tree | f1ef54222a2296bbed7103a2db1e44529e95d3a9 /Makefile.am | |
| parent | 7dc4ac0cb122bc98f903f93fc83e93007de7c751 (diff) | |
| parent | 3e0d01a69b7f70977375ab73a51cfc5004813065 (diff) | |
| download | vyatta-cfg-system-40461ef6ea9325b0dd1262cd3b99ffcbcf69dfd6.tar.gz vyatta-cfg-system-40461ef6ea9325b0dd1262cd3b99ffcbcf69dfd6.zip | |
Merge branch 'mendocino' of http://git.vyatta.com/vyatta-cfg-system into mendocino
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index b4cfbe92..cfb0f96b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,7 @@ sbin_SCRIPTS += scripts/vyatta-grub-setup sbin_SCRIPTS += scripts/standalone_root_pw_reset sbin_SCRIPTS += scripts/vyatta-passwd-sync sbin_SCRIPTS += scripts/system/vyatta_check_username.pl +sbin_SCRIPTS += scripts/system/vyatta_interface_rescan sbin_SCRIPTS += scripts/system/vyatta_update_login.pl sbin_SCRIPTS += scripts/system/vyatta_update_logrotate.pl sbin_SCRIPTS += scripts/system/vyatta_update_resolv.pl @@ -36,8 +37,6 @@ sbin_SCRIPTS += scripts/snmp/snmpd.init sbin_SCRIPTS += scripts/keepalived/vyatta-keepalived.pl sbin_SCRIPTS += scripts/keepalived/vyatta-vrrp-state.pl sbin_SCRIPTS += scripts/telnetd.init -sbin_SCRIPTS += scripts/add_bootfile_eth_hwid -sbin_SCRIPTS += scripts/mod_bootfile_eth_hwid sbin_SCRIPTS += scripts/dns-forwarding/vyatta-dns-forwarding.pl sbin_SCRIPTS += scripts/dynamic-dns/vyatta-dynamic-dns.pl sbin_SCRIPTS += scripts/vyatta-system-nameservers @@ -86,7 +85,7 @@ sysconf_DATA += sysconf/capability.conf libudevdir = /lib/udev udevrulesdir = /lib/udev/rules.d libudev_SCRIPTS = scripts/vyatta_net_name -udevrules_DATA = sysconf/69-vyatta-net.rules +udevrules_DATA = sysconf/65-vyatta-net.rules rsyslogdir = /etc/rsyslog.d rsyslog_DATA = sysconf/vyatta-log.conf |