From 8fa074af536c318338cde7a3e1992818f38382cc Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Sat, 21 Mar 2015 18:08:23 +0545 Subject: 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. --- usr/local/www/installer/installer.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'usr') 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"; } -- cgit v1.1