summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/vyatta-cfg-system.postinst.in6
-rwxr-xr-xscripts/rl-system.init2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index ec1b293b..b2719bc5 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -194,6 +194,12 @@ cp -f /opt/vyatta/etc/syslog.conf /etc/syslog.conf
# this logs unnecessary messages trying to start ddclient
rm -f /etc/ppp/ip-up.d/ddclient
+# remove old init that should have been cleaned up during upgrade but isn't
+if [ -f /etc/init.d/vyatta-ofr ]; then
+ update-rc.d -f /etc/init.d/vyatta-ofr remove
+ rm -f /etc/init.d/vyatta-ofr
+fi
+
# Local Variables:
# mode: shell-script
# sh-indentation: 4
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index 960674d8..e901e060 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -147,7 +147,7 @@ set_ipv6_params ()
echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
# These values all should be disabled
- for p in accept_source_route accept_redirects address_flush
+ for p in accept_source_route accept_redirects
do
for d in /proc/sys/net/ipv6/conf/*
do