diff options
| -rw-r--r-- | debian/vyatta-cfg.vyos-router.service | 1 | ||||
| -rwxr-xr-x | scripts/init/vyos-router | 21 |
2 files changed, 1 insertions, 21 deletions
diff --git a/debian/vyatta-cfg.vyos-router.service b/debian/vyatta-cfg.vyos-router.service index 7a1638f..6f683ce 100644 --- a/debian/vyatta-cfg.vyos-router.service +++ b/debian/vyatta-cfg.vyos-router.service @@ -1,6 +1,7 @@ [Unit] Description=VyOS Router After=systemd-journald-dev-log.socket time-sync.target local-fs.target cloud-config.service +Requires=frr.service Conflicts=shutdown.target Before=systemd-user-sessions.service diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router index 3b7ad02..8345890 100755 --- a/scripts/init/vyos-router +++ b/scripts/init/vyos-router @@ -286,27 +286,6 @@ start () # Generate DHCPv6 DUID gen_duid || log_failure_msg "could not generate DUID" - # Fixup for FRR - # In 5.1 master, zebra thinks existence of /var/run/netns is - # a requirement for netns support - mkdir -p /var/run/netns - - # Fixup for FRR save configs T3217 - mkdir -p /run/frr/config - echo "log syslog" > /run/frr/config/frr.conf - echo "log facility local7" >> /run/frr/config/frr.conf - chown -R root:frrvty /run/frr/config/frr.conf - chmod 775 /run/frr/config/frr.conf - mount --bind /run/frr/config/frr.conf /etc/frr/frr.conf - - # chown the config dir to give all admins access - chown -R root:frrvty /etc/frr - chmod 775 /etc/frr - - # Since systemd doesn't work without watchfrr and watchfrr restarts - # all daemons if just one failed, do the start manually - /usr/lib/frr/frrinit.sh start - # Mount a temporary filesystem for container networks. # Configuration should be loaded from VyOS cli. cni_dir="/etc/cni/net.d" |