diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-10-28 19:36:21 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-10-28 19:36:21 +0100 |
| commit | 556357b9cd970c1b6ba3fc5fd3d34c35e057f0dc (patch) | |
| tree | 617c5d70f6f84dafee412e7f44059f8a265187d1 /Makefile.am | |
| parent | 477396a0e1069f8876ec069ec01edb8523548cf6 (diff) | |
| parent | 7cad0a47a07c5b32e1b547e6b293a1f96daf39ba (diff) | |
| download | vyatta-cfg-556357b9cd970c1b6ba3fc5fd3d34c35e057f0dc.tar.gz vyatta-cfg-556357b9cd970c1b6ba3fc5fd3d34c35e057f0dc.zip | |
Merge branch 'current' into crux
Conflicts:
debian/vyatta-cfg.vyatta-router.service
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index f1b98aa..affc413 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,6 @@ AM_LFLAGS = --prefix=yy_`basename $* .l`_ -olex.yy.c ACLOCAL_AMFLAGS = -I m4 completion_DATA = etc/bash_completion.d/vyatta-cfg -initd_SCRIPTS = etc/init.d/vyatta-router dhcphook_SCRIPTS = scripts/vyatta-dhclient-hook logrotate_DATA = etc/logrotate.d/vyatta-config-logs logrotate_DATA += etc/logrotate.d/auth @@ -32,6 +31,19 @@ interp_DATA = functions/interpreter/vyatta-cfg-run wrapperdir = /opt/vyatta/etc/functions/ wrapper_DATA = functions/wrapper/script-template +systemdinitdir = /usr/libexec/vyos/init/ +systemdinit_SCRIPTS = scripts/init/vyos-router +systemdinit_SCRIPTS += scripts/init/vyos-config + +systemdgeneratordir = /lib/systemd/system-generators/ +systemdgenerator_SCRIPTS = scripts/system-generators/vyos-generator + +systemdgettydir = /lib/systemd/system/getty@.service.d/ +systemdgetty_DATA = lib/systemd/aftervyos.conf + +systemdserialgettydir = /lib/systemd/system/serial-getty@.service.d/ +systemdserialgetty_DATA = lib/systemd/serial/aftervyos.conf + src/cparse/cparse.cpp: src/cparse/cparse.ypp src/cparse/cparse_def.h bison -p cparse_ --defines=src/cparse/cparse.h -o $@ $< |