aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2009-05-04 14:08:48 +0200
committerHarald Hoyer <harald@redhat.com>2009-05-04 16:05:05 +0200
commitdaaacbb00de1df2464ce4e7ce29c109071923104 (patch)
tree1b649288960a7d52d8eadedcd622c0081ea07763
parent6030163ce100fce7cd73afcaee59fd28c4079b79 (diff)
downloadinitscripts-daaacbb00de1df2464ce4e7ce29c109071923104.tar
initscripts-daaacbb00de1df2464ce4e7ce29c109071923104.tar.gz
initscripts-daaacbb00de1df2464ce4e7ce29c109071923104.tar.bz2
initscripts-daaacbb00de1df2464ce4e7ce29c109071923104.tar.xz
initscripts-daaacbb00de1df2464ce4e7ce29c109071923104.zip
Break deadlock by explicitly handling alias for CTC and IUCV (#475721)
in /etc/modprobe.conf as is done in ifup-eth.
-rwxr-xr-xsysconfig/network-scripts/ifup-ctc2
-rwxr-xr-xsysconfig/network-scripts/ifup-iucv2
2 files changed, 4 insertions, 0 deletions
diff --git a/sysconfig/network-scripts/ifup-ctc b/sysconfig/network-scripts/ifup-ctc
index 514c102b..f0cbe6da 100755
--- a/sysconfig/network-scripts/ifup-ctc
+++ b/sysconfig/network-scripts/ifup-ctc
@@ -25,6 +25,8 @@ then
fi
[ -n "${MTU}" ] && opts="${opts} mtu ${MTU}"
+is_available ${REALDEVICE}
+
ifconfig ${DEVICE} ${IPADDR} ${opts} pointopoint ${GATEWAY} netmask ${NETMASK}
# Wait for the device to come up - the chandev'ified ctc driver can take
diff --git a/sysconfig/network-scripts/ifup-iucv b/sysconfig/network-scripts/ifup-iucv
index bce75aee..760cc28b 100755
--- a/sysconfig/network-scripts/ifup-iucv
+++ b/sysconfig/network-scripts/ifup-iucv
@@ -25,6 +25,8 @@ then
fi
[ -n "${MTU}" ] && opts="${opts} mtu ${MTU}"
+is_available ${REALDEVICE}
+
echo "$PEERID" > /sys/bus/iucv/drivers/netiucv/connection 2>/dev/null
ifconfig ${DEVICE} ${IPADDR} ${opts} pointopoint ${GATEWAY} netmask ${NETMASK}