summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2009-01-07 15:12:05 +0100
committermaximilian attems <maks@debian.org>2009-01-07 15:12:05 +0100
commit115134f07a0dd042355a2a6fb5a5ca987b000f5d (patch)
treeedd34844d41fe1be39c79b9cc5f803aa2b51dc77
parent8dcc1ffb9c6b17925aa5fa4883fef2a1ee85fef4 (diff)
downloadinitramfs-tools-115134f07a0dd042355a2a6fb5a5ca987b000f5d.tar.gz
initramfs-tools-115134f07a0dd042355a2a6fb5a5ca987b000f5d.zip
configure_networking: Raise ipconfig timeout to 180 seconds.
in 0.92m, the timeout for ipconfig in scripts/functions was set to 60 seconds. This broke our iscsi-rootfs setups. It took me a while to debug this, but it seems that 60 seconds is not enough for switches which have spanning-tree enabled, they need some more time before they take up a port, in our case between 62 and 65 seconds. (closes: #511085)
-rw-r--r--scripts/functions6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/functions b/scripts/functions
index ca2b831..f715e68 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -269,13 +269,13 @@ configure_networking()
;;
""|on|any)
# Bring up device
- ipconfig -t 60 ${DEVICE}
+ ipconfig -t 180 ${DEVICE}
;;
dhcp|bootp|rarp|both)
- ipconfig -t 60 -c ${IPOPTS} -d ${DEVICE}
+ ipconfig -t 180 -c ${IPOPTS} -d ${DEVICE}
;;
*)
- ipconfig -t 60 -d $IPOPTS
+ ipconfig -t 180 -d $IPOPTS
# grab device entry from ip option
NEW_DEVICE=${IPOPTS#*:*:*:*:*:*}