diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-04-24 13:33:46 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-04-24 13:33:46 -0700 |
| commit | a309f120a9ff472d45544a9101226334e426e76a (patch) | |
| tree | bfdb25a51f42443587668e8fd5ba0597b0d744d9 /etc/init.d | |
| parent | c29e34d11a22eecbaa50fa134965f2fa036f47f3 (diff) | |
| parent | 7fd560b72df1b327b4b47a6232dfcf16d6fae52c (diff) | |
| download | vyatta-cfg-a309f120a9ff472d45544a9101226334e426e76a.tar.gz vyatta-cfg-a309f120a9ff472d45544a9101226334e426e76a.zip | |
Merge branch 'glendale'
Diffstat (limited to 'etc/init.d')
| -rwxr-xr-x | etc/init.d/vyatta-ofr | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr index 89914c4..776aaf4 100755 --- a/etc/init.d/vyatta-ofr +++ b/etc/init.d/vyatta-ofr @@ -9,21 +9,21 @@ # Description: Debian init script for the Vyatta Router ### END INIT INFO # **** License **** -# Version: VPL 1.0 +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # -# The contents of this file are subject to the Vyatta Public License -# Version 1.0 ("License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# http://www.vyatta.com/vpl -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -# the License for the specific language governing rights and limitations -# under the License. -# -# This code was originally developed by Vyatta, Inc. -# Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc. -# All Rights Reserved. +# A copy of the GNU General Public License is available as +# `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution +# or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'. +# You can also obtain it by writing to the Free Software Foundation, +# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +# MA 02110-1301, USA. # # Author: Tom Grennan <tgrennan@vyatta.com> # **** End License **** @@ -66,6 +66,11 @@ have_rl_system () { # 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 [ ! -f $BOOTFILE ] ; then if [ -f $vyatta_sysconfdir/config.boot.default ]; then cp $vyatta_sysconfdir/config.boot.default $BOOTFILE |