diff options
| author | Colin Guthrie <colin@mageia.org> | 2011-11-03 22:26:54 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2011-11-03 22:26:54 +0000 |
| commit | 1e6179bf54cbc84b4ad33480e7f2f713418bb28a (patch) | |
| tree | 794b2654be506d551421bcc47d3ad97822e2861c /ppp/ipv6-up | |
| parent | 87589b49d1543595188dcb26aa5a09d33e5e0a4e (diff) | |
| parent | 6ce3e4700baa4e37e6b16e4160c00b2ebea58d81 (diff) | |
| download | initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.tar initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.tar.gz initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.tar.bz2 initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.tar.xz initscripts-1e6179bf54cbc84b4ad33480e7f2f713418bb28a.zip | |
Merge commit 'initscripts-9.34-1' into mga-34
This brings our fully patched initscripts branch up to version 9.34.
Some code was not easily merged and thus not all functionality relating
to multiple IP addresses per interface were merged in.
Conflicts:
Makefile
lang.csh
lang.sh
prefdm
rc.d/init.d/functions
rc.d/init.d/netfs
rc.d/init.d/network
rc.d/rc
rc.d/rc.local
rc.d/rc.sysinit
service
sysconfig.txt
sysconfig/network-scripts/ifdown-eth
sysconfig/network-scripts/ifup-eth
sysconfig/network-scripts/ifup-ipv6
sysconfig/network-scripts/ifup-sit
sysconfig/network-scripts/ifup-tunnel
sysconfig/network-scripts/network-functions
systemd/system/fedora-sysinit-unhack.service
Diffstat (limited to 'ppp/ipv6-up')
| -rw-r--r-- | ppp/ipv6-up | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ppp/ipv6-up b/ppp/ipv6-up index 06062cfa..54219e43 100644 --- a/ppp/ipv6-up +++ b/ppp/ipv6-up @@ -97,7 +97,7 @@ fi # Setup additional static IPv6 routes (newer config style) if [ -f "/etc/sysconfig/network-scripts/route6-$DEVICE" ]; then - cat "/etc/sysconfig/network-scripts/route6-$DEVICE" | sed 's/#.*//g' | grep -v '^[[:space:]]*$' | while read line; do + sed -ne 's/#.*//' -e '/[^[:space:]]/p' "/etc/sysconfig/network-scripts/route6-$DEVICE" | while read line; do /sbin/ip -6 route add $line done fi |