[starup/DHCP] Introduce escape to wait_dhcp_forever().

Setting the options to force dot-config/IP over DHCP can be dangerous. Until now, the switch would wait endlessly in an infinite loop. This commit introduces a way to escape the loop. This can be done by connecting to the back UART and pressing any key.

[starup/DHCP] Introduce escape to wait_dhcp_forever().
Setting the options to force dot-config/IP over DHCP can be dangerous. Until now, the switch would wait endlessly in an infinite loop. This commit introduces a way to escape the loop. This can be done by connecting to the back UART and pressing any key.
fb730c85 · Maciej Lipinski · 75f9068b · fb730c85 · fb730c85
Commit fb730c85 authored Mar 30, 2020 by Maciej Lipinski
Hide whitespace changes
Inline Side-by-side

Showing with 32 additions and 4 deletions

dot-config userspace/rootfs_override/etc/init.d/dot-config +21 -2

network userspace/rootfs_override/etc/init.d/network +11 -2

No files found.
--- a/userspace/rootfs_override/etc/init.d/dot-config
+++ b/userspace/rootfs_override/etc/init.d/dot-config
@@ -28,8 +28,17 @@ wait_dhcp_forever()
 		if [ "$?" -eq "0" ]; then
 			break
 		fi
-		echo "$me: waiting DHCP service...."
-		sleep 5
+		echo "$me: waiting DHCP service (press ENTER to abandon) ...."
+		# wait for input for 5s, timeout if no input.
+		read -t 5
+		# any input will result in the returned value to be zero
+		if [ "$?" -eq "0" ]; then
+			# report to log that something went wrong
+			echo "WARNING: Obtaining dot-config source URL from "\
+			     "DHCP service was abandoned by the user."\
+			     | tee $log_output  >& 2
+			return 1
+		fi
 	done
 }

@@ -86,6 +95,16 @@ if [ "$CONFIG_DOTCONF_SOURCE_REMOTE" = "y" ] || [ "$CONFIG_DOTCONF_SOURCE_TRY_DH
 		if [ "$CONFIG_DOTCONF_SOURCE_FORCE_DHCP" = "y" ] && [ "$CONFIG_ETH0_DHCP" = "y" ]; then
 			# Wait DHCP forever only if DHCP is also forced on management port  
 		    wait_dhcp_forever
+		    # check whether the DHCP loop was abandoned by the user (return 1)
+		    if [ "$?" -eq "1" ]; then
+		       # no DHCP, complain properly and apply the local/old dot-config
+		       echo "dhcp_error" > "$tmpdir"/dot-config_status
+		       echo "Unable to get dot-config's URL via DHCP, using old dot-config"\
+		            | tee $log_output >& 2
+		       # apply old dot-config
+		       /wr/bin/apply_dot-config
+		       exit
+		    fi
 		fi
 		# let udhcpc run /wr/bin/dhcp_get_filename.sh script to get "filename"
 		# from DHCP (which contain url with dot-config).

--- a/userspace/rootfs_override/etc/init.d/network
+++ b/userspace/rootfs_override/etc/init.d/network
@@ -19,8 +19,17 @@ wait_dhcp_forever()
 		if [ "$?" -eq "0" ]; then
 			break
 		fi
-		echo "$me: waiting DHCP service ...."
-		sleep 5
+		echo "$me: waiting DHCP service (press ENTER to abandon) ...."
+		# wait for input for 5s, timeout if no input.
+		read -t 5
+		# any input will result in the returned value to be zero
+		if [ "$?" -eq "0" ]; then
+			# report to log that something went wrong
+			echo "WARNING: Obtaining IP from DHCP service was" \
+			     "abandoned by the user."\
+			     | tee $log_output
+			break
+		fi
 	done
 }