Revision 8fa074af
Added by Phil Davis over 10 years ago
| usr/local/www/installer/installer.php | ||
|---|---|---|
| 1138 | 1138 |
function return_rowhelper_row($rownum, $mountpoint, $fstype, $disk, $size, $encpass) {
|
| 1139 | 1139 |
global $g, $select_txt, $custom_disks, $savemsg; |
| 1140 | 1140 |
$release = php_uname("r");
|
| 1141 |
$release = trim($release[0]); |
|
| 1141 |
// Get release number like 8.3 or 10.1 |
|
| 1142 |
$relnum = strtok($release, "-"); |
|
| 1142 | 1143 |
|
| 1143 | 1144 |
// Mount point |
| 1144 | 1145 |
$disks = installer_find_all_disks(); |
| ... | ... | |
| 1155 | 1156 |
); |
| 1156 | 1157 |
|
| 1157 | 1158 |
// UFS + Journaling was introduced in 9.0 |
| 1158 |
if($release == "9") {
|
|
| 1159 |
if($relnum >= 9) {
|
|
| 1159 | 1160 |
$types['UFS+J'] = "UFS + Journaling"; |
| 1160 | 1161 |
$types['UFS+J.eli'] = "Encrypted UFS + Journaling"; |
| 1161 | 1162 |
} |
Also available in: Unified diff
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.