diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2010-12-19 14:40:26 -0500 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2010-12-19 14:40:26 -0500 |
commit | 97e721e79ddf8bf3de144f1275645c734561a747 (patch) | |
tree | 49f7260d67e710b0b198bb33dcc74dbdaf5c017c | |
parent | cace4c41d8abaf3e495eb107181cbc5e628fa797 (diff) | |
download | pfsense-97e721e79ddf8bf3de144f1275645c734561a747.zip pfsense-97e721e79ddf8bf3de144f1275645c734561a747.tar.gz |
Fix typos. Only show the encryption notice once.
-rw-r--r-- | usr/local/www/installer/installer.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/usr/local/www/installer/installer.php b/usr/local/www/installer/installer.php index d67a150..279e565 100644 --- a/usr/local/www/installer/installer.php +++ b/usr/local/www/installer/installer.php @@ -427,8 +427,9 @@ EOF; function verify_before_install() { global $g, $fstype, $savemsg; - $encyrpted_root = false; - $non_encyrpted_boot = false; + $encrypted_root = false; + $non_encrypted_boot = false; + $non_encrypted_notice = false; head_html(); body_html(); page_table_start(); @@ -449,17 +450,17 @@ function verify_before_install() { if(!$_REQUEST['fstype' . $x]) continue; $tmparray = array(); - if($_REQUEST['fstype' . $x] <> "SWAP") { + if($_REQUEST['fstype' . $x] <> "SWAP") { $tmparray['mountpoint'] = $_REQUEST['mountpoint' . $x]; // Check for encrypted slice / if(stristr($_REQUEST['fstype' . $x], ".eli")) { if($tmparray['mountpoint'] == "/") - $encyrpted_root = true; + $encrypted_root = true; } // Check if we have a non-encrypted /boot if($tmparray['mountpoint'] == "/boot") { if(!stristr($_REQUEST['fstype' . $x], ".eli")) - $non_encyrpted_boot = true; + $non_encrypted_boot = true; } if($tmparray['mountpoint'] == "/conf") { $tmparray['mountpoint'] = "/conf{$x}"; @@ -468,9 +469,11 @@ function verify_before_install() { } else { $tmparray['mountpoint'] = "none"; } - // If we have an encrypted /root and lack a non encyrpted /boot, throw an error/warning - if($encyrpted_root && $non_encyrpted_boot) + // If we have an encrypted /root and lack a non encrypted /boot, throw an error/warning + if($encrypted_root && !$non_encrypted_boot && !$non_encrypted_notice) { $error_txt .= "<center><font color='red'>A non-encrypted /boot slice is required when encrypting the / slice</font></center><br/>"; + $non_encrypted_notice = true; + } $tmparray['disk'] = $_REQUEST['disk' . $x]; $tmparray['fstype'] = $_REQUEST['fstype' . $x]; $tmparray['size'] = $_REQUEST['size' . $x]; |