summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-03-19 22:37:41 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-03-19 22:37:41 +0000
commit655a80ebcf8a9adada3eae1a693f6d2034c45a72 (patch)
treee9bf43a25cfd77ee1d060ed4861d09b2ddaa7410
parente7435c3b356e1c1440e3e801a9a8200ae79d1f2a (diff)
downloadpfsense-655a80ebcf8a9adada3eae1a693f6d2034c45a72.zip
pfsense-655a80ebcf8a9adada3eae1a693f6d2034c45a72.tar.gz
Look for configuration on d slice as well
-rw-r--r--etc/inc/config.inc14
1 files changed, 14 insertions, 0 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 99d790a..3c60fdb 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -75,6 +75,20 @@ if ($g['booting']) {
if ($cfgdevice)
break;
}
+ if (mwexec("/sbin/mount -r /dev/{$mountdisk}d {$g['cf_path']}") == 0) {
+ if (file_exists("{$g['cf_conf_path']}/config.xml")) {
+ /* found it */
+ $cfgdevice = $mountdisk;
+ $cfgpartition = $cfgdevice . "a";
+ $cfgfstype = "ufs";
+ echo "Found configuration on $cfgdevice.\n";
+ }
+
+ mwexec("/sbin/umount -f {$g['cf_path']}");
+
+ if ($cfgdevice)
+ break;
+ }
}
}
OpenPOWER on IntegriCloud