diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-08-24 16:58:06 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-08-24 16:58:06 +0200 |
| commit | e62009185220f6a56dee4e11c5b3576b6addc8e1 (patch) | |
| tree | 757172387116052980064edafb51a1e5974e3d70 | |
| parent | ef76c2a1b9076cff19691b63fe03b2e9c2e2fccb (diff) | |
| download | vyatta-cfg-e62009185220f6a56dee4e11c5b3576b6addc8e1.tar.gz vyatta-cfg-e62009185220f6a56dee4e11c5b3576b6addc8e1.zip | |
T441: adjust init scripts and postinst actions to use FRR instead of quagga.
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/vyatta-cfg.postinst.in | 1 | ||||
| -rw-r--r-- | debian/vyatta-cfg.vyatta-router.service | 2 | ||||
| -rw-r--r-- | etc/default/vyatta-cfg | 2 | ||||
| -rwxr-xr-x | etc/init.d/vyatta-router | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/debian/control b/debian/control index 2daa0f4..ef5ab31 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,6 @@ Depends: sed (>= 4.1.5), libvyatta-cfg1 (>=${binary:Version}), unionfs-fuse, libboost-filesystem1.55.0 | libboost-filesystem1.62.0, - vyatta-quagga, libapt-pkg4.12, ${perl:Depends}, ${shlibs:Depends} Suggests: util-linux (>= 2.13-5), diff --git a/debian/vyatta-cfg.postinst.in b/debian/vyatta-cfg.postinst.in index fc9b07b..74e882a 100644 --- a/debian/vyatta-cfg.postinst.in +++ b/debian/vyatta-cfg.postinst.in @@ -18,6 +18,7 @@ done update-rc.d vyatta-router defaults 90 >/dev/null systemctl enable vyatta-router.service >/dev/null +systemctl enable frr.service > /dev/null # capability stuff for bin in my_cli_bin my_cli_shell_api; do diff --git a/debian/vyatta-cfg.vyatta-router.service b/debian/vyatta-cfg.vyatta-router.service index 3524b85..84852fd 100644 --- a/debian/vyatta-cfg.vyatta-router.service +++ b/debian/vyatta-cfg.vyatta-router.service @@ -2,7 +2,7 @@ SourcePath=/etc/init.d/vyatta-router Description=VyOS Router Before=runlevel2.target runlevel3.target runlevel4.target runlevel5.target shutdown.target getty@tty1.service getty@tty2.service getty@rrt3.service getty@tty4.service getty@tty5.service getty@tty6.service -After=systemd-journald-dev-log.socket time-sync.target local-fs.target vyatta-unicast.service +After=systemd-journald-dev-log.socket time-sync.target local-fs.target frr.service Conflicts=shutdown.target [Service] diff --git a/etc/default/vyatta-cfg b/etc/default/vyatta-cfg index bc7854a..a30ce0b 100644 --- a/etc/default/vyatta-cfg +++ b/etc/default/vyatta-cfg @@ -17,7 +17,7 @@ fi is_admin=0 is_users=0 VYATTA_LEVEL_GROUP_ADMIN=vyattacfg -VYATTA_LEVEL_GROUP_USERS=quaggavty +VYATTA_LEVEL_GROUP_USERS=frrvty local -a groups=( $(id -Gn) ) for g in "${groups[@]}"; do if [ "$g" == "$VYATTA_LEVEL_GROUP_ADMIN" ]; then diff --git a/etc/init.d/vyatta-router b/etc/init.d/vyatta-router index b26c01f..f5c9ebd 100755 --- a/etc/init.d/vyatta-router +++ b/etc/init.d/vyatta-router @@ -1,7 +1,7 @@ #!/bin/bash ### BEGIN INIT INFO # Provides: vyatta-router -# Required-Start: $syslog $time $local_fs vyatta-unicast +# Required-Start: $syslog $time $local_fs # Required-Stop: $syslog $time $local_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 |