diff options
| author | Kim <kim.sidney@gmail.com> | 2018-10-14 21:33:06 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-10-15 02:33:06 +0700 |
| commit | 576786c97065c8e5638e9e0a7cad688175cd3746 (patch) | |
| tree | 8fc811fa1e16e4a63fd652d98394e7b4610ccfaf /Makefile.am | |
| parent | 1f1175135c8b15322852319150c8ed12d99b7a92 (diff) | |
| download | vyatta-cfg-576786c97065c8e5638e9e0a7cad688175cd3746.tar.gz vyatta-cfg-576786c97065c8e5638e9e0a7cad688175cd3746.zip | |
Rework vyos router init (#11)
* Add a systemd vyos.target and split the vyatta-router
init script to multiple systemd scripts.
* remove ref to cloud-init
* Remove vyatta-router init and rename vyatta-router to vyos-initialize.
* Install files to correct dirs
* try to fix systemd boot issues
* Update script names
run config load in background to not block systemd
* Prevent cat: write error: Broken pipe
* Rework vyos startup
* add systemd to Makefile.am
* Update script name
* Fix inclusion of getty conf
* Fix indentation
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index f1b98aa..81c1b1b 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,16 @@ 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 = /etc/systemd/system/getty@.service.d/ +systemdgetty_DATA = etc/systemd/aftervyos.conf + src/cparse/cparse.cpp: src/cparse/cparse.ypp src/cparse/cparse_def.h bison -p cparse_ --defines=src/cparse/cparse.h -o $@ $< |