summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2011-01-19 19:07:07 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2011-01-20 15:08:01 -0800
commit90b3c8f96073d201523c08e16770a2656fba0304 (patch)
tree2bfa7a0091664cc02aac79b8ec9b7e721256fcea
parent7277839574d6a2fc0ef2ca62ae0ca1b099a73c69 (diff)
downloadvyatta-cfg-quagga-90b3c8f96073d201523c08e16770a2656fba0304.tar.gz
vyatta-cfg-quagga-90b3c8f96073d201523c08e16770a2656fba0304.zip
Bugfix 6684: Don't delete wanpipe config files.
The wanpipe config files are managed by the vyatta-serial package. So this package should not touch them. (cherry picked from commit 256bf73dda76b68fe756c5299b0732336dc60e8a)
-rwxr-xr-xscripts/rl-system.init6
1 files changed, 0 insertions, 6 deletions
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index fddea32a..3106d593 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -61,11 +61,6 @@ empty()
shopt -s extglob nullglob
-clear_serial () {
- rm -f /etc/wanpipe/*.conf /etc/ppp/peers/wan*
- rm -f /var/run/vyatta/*.description
-}
-
search_config_if_wan () {
grep -q "\<serial\>.*\<$1\>" $BOOTFILE
}
@@ -201,7 +196,6 @@ start () {
log_failure_msg "can\'t reset config files"
setup_ntp_config_file
- clear_serial
add_new_serial_if || \
log_failure_msg "can\'t add serial interfaces"