aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiloslav Trmac <mitr@volny.cz>2006-03-20 01:04:01 +0000
committerMiloslav Trmac <mitr@volny.cz>2006-03-20 01:04:01 +0000
commit658784e3955a7631f10b502f3a828ac12b5073c6 (patch)
tree7e042511686a5649941d9a3774d4f7e058b6f1f5
parent134f60e9dfb3e6b4bcd18f7ab866e50808dc25fd (diff)
downloadinitscripts-658784e3955a7631f10b502f3a828ac12b5073c6.tar
initscripts-658784e3955a7631f10b502f3a828ac12b5073c6.tar.gz
initscripts-658784e3955a7631f10b502f3a828ac12b5073c6.tar.bz2
initscripts-658784e3955a7631f10b502f3a828ac12b5073c6.tar.xz
initscripts-658784e3955a7631f10b502f3a828ac12b5073c6.zip
Provide the underlying device name to ip-up (and thus ifup-routes) for PPP
devices (#92023)
-rw-r--r--ppp/ip-up2
-rwxr-xr-xsysconfig/network-scripts/ifup-post10
2 files changed, 10 insertions, 2 deletions
diff --git a/ppp/ip-up b/ppp/ip-up
index 43e83ca6..e610674d 100644
--- a/ppp/ip-up
+++ b/ppp/ip-up
@@ -8,7 +8,7 @@ export PATH
LOGDEVICE=$6
REALDEVICE=$1
-[ -f /etc/sysconfig/network-scripts/ifcfg-${LOGDEVICE} ] && /etc/sysconfig/network-scripts/ifup-post ifcfg-${LOGDEVICE}
+[ -f /etc/sysconfig/network-scripts/ifcfg-${LOGDEVICE} ] && /etc/sysconfig/network-scripts/ifup-post --realdevice ${REALDEVICE} ifcfg-${LOGDEVICE}
/etc/ppp/ip-up.ipv6to4 ${LOGDEVICE}
diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
index cf07130b..54bc27f9 100755
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -5,14 +5,22 @@ cd /etc/sysconfig/network-scripts
[ -f ../network ] && . ../network
+unset REALDEVICE
+if [ "$1" = --realdevice ] ; then
+ REALDEVICE=$2
+ shift 2
+fi
+
CONFIG=$1
source_config
+[ -z "$REALDEVICE" ] && REALDEVICE=$DEVICE
+
if [ "$ISALIAS" = no ] ; then
/etc/sysconfig/network-scripts/ifup-aliases ${DEVICE} ${CONFIG}
fi
-/etc/sysconfig/network-scripts/ifup-routes ${DEVICE} ${DEVNAME}
+/etc/sysconfig/network-scripts/ifup-routes ${REALDEVICE} ${DEVNAME}
if [ "$PEERDNS" != "no" -o -n "$RESOLV_MODS" -a "$RESOLV_MODS" != "no" ]; then