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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/systemd/aftervyos.conf | 3 | ||||
| -rw-r--r-- | lib/systemd/serial/aftervyos.conf | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/systemd/aftervyos.conf b/lib/systemd/aftervyos.conf new file mode 100644 index 0000000..c575390 --- /dev/null +++ b/lib/systemd/aftervyos.conf @@ -0,0 +1,3 @@ +[Service] +ExecStartPre=-/usr/libexec/vyos/init/vyos-config +StandardOutput=journal+console diff --git a/lib/systemd/serial/aftervyos.conf b/lib/systemd/serial/aftervyos.conf new file mode 100644 index 0000000..8ba4277 --- /dev/null +++ b/lib/systemd/serial/aftervyos.conf @@ -0,0 +1,3 @@ +[Service] +ExecStartPre=-/usr/libexec/vyos/init/vyos-config SERIAL +StandardOutput=journal+console |