1 files changed, 34 insertions, 53 deletions
diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc
index 3efd2f3..f074ac7 100644
--- a/src/etc/inc/config.inc
+++ b/src/etc/inc/config.inc
@@ -98,63 +98,44 @@ if (platform_booting(true)) {
 		/* check if there's already an fstab (NFS booting?) */
 		if (!file_exists("{$g['etc_path']}/fstab")) {
 			echo ".";
-			if (strstr($g['platform'], "cdrom")) {
-				/* config is on floppy disk for CD-ROM version */
-				$cfgdevice = $cfgpartition = "fd0";
-				$_gb = exec('/sbin/dmesg -a', $dmesg);
-				if (preg_match("/da0/", $dmesg) == true) {
-					$cfgdevice = $cfgpartition = "da0" ;
-					if (mwexec("/sbin/mount -r /dev/{$cfgdevice} /cf")) {
-						/* could not mount, fallback to floppy */
-						$cfgdevice = $cfgpartition = "fd0";
+			/* probe kernel known disks until we find one with config.xml */
+			$disks = explode(" ", get_single_sysctl("kern.disks"));
+			foreach ($disks as $mountdisk) {
+				/* skip mfs mounted filesystems */
+				if (strstr($mountdisk, "md")) {
+					continue;
+				}
+				if (mwexec("/sbin/mount -r /dev/{$mountdisk}a {$g['cf_path']}") == 0) {
+					if (file_exists("{$g['cf_conf_path']}/config.xml")) {
+						/* found it */
+						$cfgdevice = $mountdisk;
+						$cfgpartition = $cfgdevice . "a";
+						$cfgfstype = "ufs";
+						printf(gettext("Found configuration on %s.%s"), $cfgdevice, "\n");
+					}
+
+					mwexec("/sbin/umount -f {$g['cf_path']}");
+
+					if ($cfgdevice) {
+						break;
 					}
 				}
-				unset($dmesg);
-				$cfgfstype = "msdosfs";
-				echo gettext("CDROM build") . "\n";
-				echo "   " . gettext("CFG:") . " {$cfgpartition}\n";
-				echo "  " . gettext("TYPE:") . " {$cfgfstype}\n";
-			} else {
-				echo ".";
-				/* probe kernel known disks until we find one with config.xml */
-				$disks = explode(" ", get_single_sysctl("kern.disks"));
-				foreach ($disks as $mountdisk) {
-					/* skip mfs mounted filesystems */
-					if (strstr($mountdisk, "md")) {
-						continue;
+				if (mwexec("/sbin/mount -r /dev/{$mountdisk}d {$g['cf_path']}") == 0) {
+					if (platform_booting()) {
+						echo ".";
 					}
-					if (mwexec("/sbin/mount -r /dev/{$mountdisk}a {$g['cf_path']}") == 0) {
-						if (file_exists("{$g['cf_conf_path']}/config.xml")) {
-							/* found it */
-							$cfgdevice = $mountdisk;
-							$cfgpartition = $cfgdevice . "a";
-							$cfgfstype = "ufs";
-							printf(gettext("Found configuration on %s.%s"), $cfgdevice, "\n");
-						}
-
-						mwexec("/sbin/umount -f {$g['cf_path']}");
-
-						if ($cfgdevice) {
-							break;
-						}
+					if (file_exists("{$g['cf_conf_path']}/config.xml")) {
+						/* found it */
+						$cfgdevice = $mountdisk;
+						$cfgpartition = $cfgdevice . "d";
+						$cfgfstype = "ufs";
+						printf(gettext("Found configuration on %s.%s"), $cfgdevice, "\n");
 					}
-					if (mwexec("/sbin/mount -r /dev/{$mountdisk}d {$g['cf_path']}") == 0) {
-						if (platform_booting()) {
-							echo ".";
-						}
-						if (file_exists("{$g['cf_conf_path']}/config.xml")) {
-							/* found it */
-							$cfgdevice = $mountdisk;
-							$cfgpartition = $cfgdevice . "d";
-							$cfgfstype = "ufs";
-							printf(gettext("Found configuration on %s.%s"), $cfgdevice, "\n");
-						}
-
-						mwexec("/sbin/umount -f {$g['cf_path']}");
-
-						if ($cfgdevice) {
-							break;
-						}
+
+					mwexec("/sbin/umount -f {$g['cf_path']}");
+
+					if ($cfgdevice) {
+						break;
 					}
 				}
 			}