diff options
| author | Tom Grennan <tgrennan@vyatta.com> | 2008-01-03 17:17:32 -0800 |
|---|---|---|
| committer | Tom Grennan <tgrennan@vyatta.com> | 2008-01-03 17:17:32 -0800 |
| commit | 62e9560404415217ffef5c547e28e96ddf2505a3 (patch) | |
| tree | ba5c14423cab3295e7420fa8f929eeb936edcffc | |
| parent | f437c62e5429f03aff962ca5885be8057359d75e (diff) | |
| download | vyatta-cfg-62e9560404415217ffef5c547e28e96ddf2505a3.tar.gz vyatta-cfg-62e9560404415217ffef5c547e28e96ddf2505a3.zip | |
work w/ either quagga (debian) or vyatta-quagga packages
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | etc/init.d/vyatta-ofr | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/debian/control b/debian/control index 0ebf92d..a7990bd 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Depends: bash (>= 3.1), sed (>= 4.1.5), perl (>= 5.8.8), procps (>= 1:3.2.7-3), - quagga, + vyatta-quagga | quagga, coreutils (>= 5.97-5.3), vyatta-op, vyatta-config-migrate, diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr index 4f8b7dd..aab2023 100755 --- a/etc/init.d/vyatta-ofr +++ b/etc/init.d/vyatta-ofr @@ -54,13 +54,11 @@ else for s in ${all_subinits[@]} ; do [ -x ${vyatta_sbindir}/${s}.init ] && subinit[${#subinit}]=$s done -# NOTE: rtrmgr (i.e. xorp) is mutually exclusive of quagga - if [ -x /etc/init.d/quagga ] ; then - # quagga should already be started. - GROUP=quaggavty - elif [ -x ${vyatta_sbindir}/rtrmgr.init ] ; then - subinit[${#subinit}]=rtrmgr + if [ -x ${vyatta_sbindir}/rtrmgr.init ] ; then + subinit+=( rtrmgr ) GROUP=xorp + else + GROUP=quaggavty fi fi |