Seperate autodetection out of previous function

1 files changed, 13 insertions, 14 deletions

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 2a867d5..b401050 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -759,30 +759,29 @@ EOD;
 		if($noreboot <> true)
 			system_reboot_sync();
 	}
+}
 
-	function autodetect_interface($ifname, $fp) {
-		$iflist_prev = get_interface_list();
-		echo <<<EOD
+function autodetect_interface($ifname, $fp) {
+	$iflist_prev = get_interface_list();
+	echo <<<EOD
 
 Connect the {$ifname} interface now and make sure that the link is up.
 Then press ENTER to continue.
 
 EOD;
-		fgets($fp);
-		$iflist = get_interface_list();
+	fgets($fp);
+	$iflist = get_interface_list();
 
-		foreach ($iflist_prev as $ifn => $ifa) {
-			if (!$ifa['up'] && $iflist[$ifn]['up']) {
-				echo "Detected link-up on interface {$ifn}.\n";
-				return $ifn;
-			}
+	foreach ($iflist_prev as $ifn => $ifa) {
+		if (!$ifa['up'] && $iflist[$ifn]['up']) {
+			echo "Detected link-up on interface {$ifn}.\n";
+			return $ifn;
 		}
-
-		echo "No link-up detected.\n";
-
-		return null;
 	}
 
+	echo "No link-up detected.\n";
+
+	return null;
 }
 
 function vlan_setup() {