Revert to merge.

1 files changed, 11 insertions, 10 deletions

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index b560deb..14ab8b1 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -279,14 +279,10 @@ function conf_mount_rw() {
 	/* don't use mount -u anymore
 	   (doesn't sync the files properly and /bin/sync won't help either) */
 	$status = mwexec("/sbin/umount -f {$g['cf_path']}");
-	while($status < 0) {
-		mwexec("/sbin/fsck -y");
-		$status = mwexec("/sbin/umount -f {$g['cf_path']}");
-	}
 
 	$status = mwexec("/sbin/mount -w -o noatime {$g['cf_path']}");
-	while($status < 0) {
-		mwexec("/sbin/fsck -y");
+	if($status <> 0) {
+		mwexec("/sbin/fsck -y {$g['cf_path']}");
 		$status = mwexec("/sbin/mount -w -o noatime {$g['cf_path']}");
 	}
 
@@ -298,7 +294,7 @@ function conf_mount_rw() {
 		mwexec("/sbin/umount -f /");
 		$status = mwexec("/sbin/mount -w /");
 		/* we could not mount this correctly.  kick off fsck */
-		while($status < 0) {
+		if($status <> 0) {
 			log_error("File system is dirty.  Launching FSCK for /");
 			mwexec("/sbin/fsck -y");
 			$status = mwexec("/sbin/mount -w /");
@@ -872,7 +868,7 @@ function set_networking_interfaces_ports() {
 
 	$fp = fopen('php://stdin', 'r');
 
-	$iflist = get_interface_list("media");
+	$iflist = get_interface_list();
 
 	echo <<<EOD
 
@@ -914,6 +910,10 @@ EOD;
 
 	echo <<<EOD
 
+*NOTE*  pfSense requires *ATLEAST* 2 assigned interfaces to function.
+        If you do not have two interfaces turn off the machine until
+	you do.
+
 If you do not know the names of your interfaces, you may choose to use
 auto-detection... In that case, disconnect all interfaces now before
 hitting a.   The system will then prompt you to plug in each nic to
@@ -1078,7 +1078,7 @@ EOD;
 }
 
 function autodetect_interface($ifname, $fp) {
-	$iflist_prev = get_interface_list("media");
+	$iflist_prev = get_interface_list();
 	echo <<<EOD
 
 Connect the {$ifname} interface now and make sure that the link is up.
@@ -1086,7 +1086,8 @@ Then press ENTER to continue.
 
 EOD;
 	fgets($fp);
-	$iflist = get_interface_list("media");
+	$iflist = get_interface_list();
+
 	foreach ($iflist_prev as $ifn => $ifa) {
 		if (!$ifa['up'] && $iflist[$ifn]['up']) {
 			echo "Detected link-up on interface {$ifn}.\n";