Merge remote-tracking branch 'origin/merge-requests/13'

Change default DHCP timeout to 60 seconds instead of 20 to avoid STP issues.

See merge request mkinitcpio/mkinitcpio-archiso!13

1 files changed, 3 insertions, 1 deletions

diff --git a/hooks/archiso_pxe_common b/hooks/archiso_pxe_common
index 6cadc34..3c4126b 100644
--- a/hooks/archiso_pxe_common
+++ b/hooks/archiso_pxe_common
@@ -32,7 +32,9 @@ run_hook() {
         fi
 
         # setup network and save some values
-        if ! ipconfig -t 20 "ip=${ip}"; then
+        # Timeout is set to 60 by default to avoid issues with STP default values
+        # (15 second listening, 15 seconds learning and 20 seconds for max age)
+        if ! ipconfig -t 60 "ip=${ip}"; then
             echo "ERROR; Failed to configure network"
             echo "   Falling back to interactive prompt"
             echo "   You can try to fix the problem manually, log out when you are finished"