diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-12-02 18:09:20 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-12-02 18:09:20 -0800 |
| commit | ee87a223623a80469beec50a2c0b6c0c121fe99b (patch) | |
| tree | 30aa6250318cec26c1d0fe59fad97fa64cedb324 | |
| parent | 50b38e9ca3b99c588a2a806c88a235c14021fd27 (diff) | |
| parent | 8cbb86579e03e793bc1bd0afad66da225ff94867 (diff) | |
| download | vyatta-cfg-system-ee87a223623a80469beec50a2c0b6c0c121fe99b.tar.gz vyatta-cfg-system-ee87a223623a80469beec50a2c0b6c0c121fe99b.zip | |
Merge branch 'kenwood' of suva.vyatta.com:/git/vyatta-cfg-system into kenwood
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | templates/system/ipv6/disable-forwarding/node.def | 30 |
2 files changed, 36 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 35ce7bfd..77bed4e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +vyatta-cfg-system (0.15.115) unstable; urgency=low + + [ Stephen Hemminger ] + * Pass more info to login scripts + * Don't lose user customization to pam-auth + * Simply Radius server update + + [ Bob Gilligan ] + * Changes related to co-ordination between kernel parameters and + radvd. + + -- Bob Gilligan <gilligan@vyatta.com> Wed, 02 Dec 2009 16:48:52 -0800 + vyatta-cfg-system (0.15.114) unstable; urgency=low [ Stephen Hemminger ] diff --git a/templates/system/ipv6/disable-forwarding/node.def b/templates/system/ipv6/disable-forwarding/node.def index 2c8f4ac5..a029c81a 100644 --- a/templates/system/ipv6/disable-forwarding/node.def +++ b/templates/system/ipv6/disable-forwarding/node.def @@ -3,23 +3,39 @@ help: Disable IPv6 forwarding on all interfaces # Disable IPv6 forwarding for all interfaces we currently have, # and set default such that it will be disabled on any new interfaces # that come up after this. +# create: sudo sh -c "echo 0 > /proc/sys/net/ipv6/conf/all/forwarding" sudo sh -c "echo 0 > /proc/sys/net/ipv6/conf/default/forwarding" -# Re-enable IPv6 forwarding globally. But only enable it for those -# interfaces that do not have forwarding disabled on a per-interface -# basis. A per-interface flag file under /var/run/vyatta/ tells us if -# it is disabled. Restore default value so that any new interfaces -# that come up after this will have forwarding enabled. +# Re-enable IPv6 forwarding globally. But setting the global +# forwarding parameter under "all" has the side effect of setting the +# per-interface forwarding parameter for all interfaces. Users may +# disable forwarding per-interface, so we have to restore the state of +# the per-interface parameter here. A per-interface flag file under +# /var/run/vyatta/ tells us if forwarding is disabled on specific +# interfaces. Restore default value of the forwarding parameter under +# "default" so that any new interfaces that come up after this will +# have forwarding enabled. +# delete: + sudo sh -c "echo 1 > /proc/sys/net/ipv6/conf/all/forwarding" cd /proc/sys/net/ipv6/conf for i in * ; do if [ "$i" = "default" -o "$i" = "all" -o ! -d "$i" ]; then continue fi - if [ ! -e /var/run/vyatta/ipv6_no_fwd.$i ]; then - sudo sh -c "echo 1 > $i/forwarding" + if [ -e /var/run/vyatta/ipv6_no_fwd.$i ]; then + sudo sh -c "echo 0 > $i/forwarding" fi done sudo sh -c "echo 1 > /proc/sys/net/ipv6/conf/default/forwarding" + # + # If router advertisements were configured while global IPv6 + # forwarding was disabled, we will need to start the radvd daemon + # now. + running=`ps --no-headers -C radvd | wc -l` + if [ $running -eq 0 -a -e /etc/radvd.conf -a -x /etc/init.d/radvd ]; then + /etc/init.d/radvd start + fi + |