diff options
| author | Daniil Baturin <daniil@baturin.org> | 2013-11-03 02:20:09 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2013-11-03 02:20:09 +0100 |
| commit | 75c60eaeaee9986a9de92d85ae60b3f753328f03 (patch) | |
| tree | 14813f0edb11e026badd442e814946ba672a87de | |
| parent | a82f1f2fa510b1feca0976ef3587bd3a3078d4da (diff) | |
| download | vyatta-cfg-75c60eaeaee9986a9de92d85ae60b3f753328f03.tar.gz vyatta-cfg-75c60eaeaee9986a9de92d85ae60b3f753328f03.zip | |
Remove some XORP-related checks.
| -rwxr-xr-x | etc/init.d/vyatta-router | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/etc/init.d/vyatta-router b/etc/init.d/vyatta-router index 6aac5bc..9b829f8 100755 --- a/etc/init.d/vyatta-router +++ b/etc/init.d/vyatta-router @@ -51,14 +51,10 @@ else for s in ${all_subinits[@]} ; do [ -x ${vyatta_sbindir}/${s}.init ] && subinit[${#subinit}]=$s done - if [ -x ${vyatta_sbindir}/rtrmgr.init ] ; then - subinit+=( rtrmgr ) - GROUP=xorp - else - GROUP=vyattacfg - fi fi +GROUP=vyattacfg + # check if bootup of this portion is disabled disabled () { grep -q -w novyatta-$1 /proc/cmdline @@ -66,12 +62,7 @@ disabled () { # if necessary, provide initial config init_bootfile () { - if [ -f $BOOTFILE ] && grep -q '/\*XORP Configuration File, v1.0\*/' \ - $BOOTFILE >&/dev/null; then - CURTIME=$(date +%F-%H%M%S) - mv $BOOTFILE $BOOTFILE.pre-glendale.$CURTIME - fi - if [ ! -r $BOOTFILE ] ; then + if [ ! -r $BOOTFILE ] ; then if [ -f $vyatta_sysconfdir/config.boot.default ]; then cp $vyatta_sysconfdir/config.boot.default $BOOTFILE else @@ -81,12 +72,6 @@ init_bootfile () { chgrp ${GROUP} $BOOTFILE chmod 660 $BOOTFILE fi - - if grep -q -x 'rtrmgr {' $BOOTFILE ; then - ## remove the unnecessary and potentially conflicting - ## config-directory statement (i.e. /mnt/floppy vs. /media/floppy) - sed -i '/^rtrmgr {$/,/^}$/d' $BOOTFILE - fi } # if necessary, migrate initial config |