From cf7cd237d4466d9b41263769c3ba34af97bca5f0 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 14 Aug 2010 21:56:18 -0400
Subject: Probe disk before creating ZFS easy install string

---
 usr/local/www/installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr')

diff --git a/usr/local/www/installer.php b/usr/local/www/installer.php
index 2f69832..404f804 100644
--- a/usr/local/www/installer.php
+++ b/usr/local/www/installer.php
@@ -672,10 +672,10 @@ function installer_main() {
 		unlink("/tmp/.pc-sysinstall/pc-sysinstall.log");
 	head_html();
 	body_html();
+	$disk = installer_find_first_disk();
 	// Only enable ZFS if this exists.  The install will fail otherwise.
 	if(file_exists("/boot/gptzfsboot")) 
 		$zfs_enabled = "<tr bgcolor=\"#9A9A9A\"><td align=\"center\"><a href=\"installer.php?state=verify_before_install&fstype=ZFS\">Easy installation of {$g['product_name']} using the ZFS filesystem on disk {$disk}</a></td></tr>";
-	$disk = installer_find_first_disk();
 	page_table_start();
 	echo <<<EOF
 		<form action="installer.php" method="post" state="step1_post">
-- 
cgit v1.1