summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2015-03-21 18:08:23 +0545
committerRenato Botelho <garga@FreeBSD.org>2015-03-23 08:15:57 -0300
commit4e34cdf3bfda8a955082d8eb86cec028237c22aa (patch)
tree7f1b6d07a84d21b8e2dcb60bcbcac49953cbeff7
parentc2b0382055df006659dff56c48f981c4ec5b79c6 (diff)
downloadpfsense-4e34cdf3bfda8a955082d8eb86cec028237c22aa.zip
pfsense-4e34cdf3bfda8a955082d8eb86cec028237c22aa.tar.gz
Handle release number in installer
This code just looked wrong. It was considering 10.1-RELEASE-p6 to be release number "1" and comparing it to "9". These changes to do what it seems to intend. This will make that UFS+J stuff appear, if that is of any consequence.
-rw-r--r--usr/local/www/installer/installer.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/local/www/installer/installer.php b/usr/local/www/installer/installer.php
index 90c138b..8f5dd91 100644
--- a/usr/local/www/installer/installer.php
+++ b/usr/local/www/installer/installer.php
@@ -1138,7 +1138,8 @@ EOF;
function return_rowhelper_row($rownum, $mountpoint, $fstype, $disk, $size, $encpass) {
global $g, $select_txt, $custom_disks, $savemsg;
$release = php_uname("r");
- $release = trim($release[0]);
+ // Get release number like 8.3 or 10.1
+ $relnum = strtok($release, "-");
// Mount point
$disks = installer_find_all_disks();
@@ -1155,7 +1156,7 @@ function return_rowhelper_row($rownum, $mountpoint, $fstype, $disk, $size, $encp
);
// UFS + Journaling was introduced in 9.0
- if($release == "9") {
+ if($relnum >= 9) {
$types['UFS+J'] = "UFS + Journaling";
$types['UFS+J.eli'] = "Encrypted UFS + Journaling";
}
OpenPOWER on IntegriCloud