mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle release number in installer

Browse Source 
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.
This commit is contained in:
Phil Davis 2015-03-21 18:08:23 +05:45 committed by Renato Botelho
parent c2b0382055
commit 4e34cdf3bf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr/local/www/installer/installer.php
View File

@ -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";
}