diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2010-08-14 21:12:05 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2010-08-14 21:12:05 -0400 |
| commit | 5a69cb0659dae2bfb481c31a6c57ff4f829225ac (patch) | |
| tree | 00f6cf60aa9c11a0972c1f970abc7e0edad5e40d /usr/local | |
| parent | 3fcc3999dacb8e92d22fa68922a0cb07141c481d (diff) | |
| download | pfsense-5a69cb0659dae2bfb481c31a6c57ff4f829225ac.zip pfsense-5a69cb0659dae2bfb481c31a6c57ff4f829225ac.tar.gz | |
Sync pc-sysinstall with FreeBSD-CURRENT and remove old /PCBSD version. Change installer.php to match new path
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/installer.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr/local/www/installer.php b/usr/local/www/installer.php index a6958c1..1e860d6 100644 --- a/usr/local/www/installer.php +++ b/usr/local/www/installer.php @@ -30,7 +30,7 @@ require("globals.inc"); require("guiconfig.inc"); -define('PC_SYSINSTALL', '/PCBSD/pc-sysinstall/pc-sysinstall'); +define('PC_SYSINSTALL', '/usr/sbin/pc-sysinstall'); if($g['platform'] == "pfSense" or $g['platform'] == "nanobsd") { Header("Location: /index.php"); @@ -57,7 +57,7 @@ switch ($_REQUEST['state']) { } function write_out_pc_sysinstaller_config($disk, $fstype = "UFS+S") { - $fd = fopen("/PCBSD/pc-sysinstall/examples/pfSense-install.cfg", "w"); + $fd = fopen("/usr/sbin/pc-sysinstall/examples/pfSense-install.cfg", "w"); if(!$fd) { return true; } @@ -111,7 +111,7 @@ function start_installation() { exit; } fwrite($fd, "rm /tmp/.pc-sysinstall/pc-sysinstall.log 2>/dev/null\n"); - fwrite($fd, "/PCBSD/pc-sysinstall/pc-sysinstall -c /PCBSD/pc-sysinstall/examples/pfSense-install.cfg \n"); + fwrite($fd, "/usr/sbin/pc-sysinstall/pc-sysinstall -c /usr/sbin/pc-sysinstall/examples/pfSense-install.cfg \n"); fwrite($fd, "chmod a+rx /usr/local/bin/after_installation_routines.sh\n"); fwrite($fd, "cd / && /usr/local/bin/after_installation_routines.sh\n"); fwrite($fd, "mkdir /mnt/tmp\n"); @@ -124,13 +124,13 @@ function start_installation() { function installer_find_first_disk() { global $g, $fstype; - $disk = `/PCBSD/pc-sysinstall/pc-sysinstall disk-list | head -n1 | cut -d':' -f1`; + $disk = `/usr/sbin/pc-sysinstall/pc-sysinstall disk-list | head -n1 | cut -d':' -f1`; return $disk; } function pcsysinstall_get_disk_info($diskname) { global $g, $fstype; - $disk = split("\n", `/PCBSD/pc-sysinstall/pc-sysinstall disk-list`); + $disk = split("\n", `/usr/sbin/pc-sysinstall/pc-sysinstall disk-list`); $disks_array = array(); foreach($disk as $d) { if(!$d) @@ -138,7 +138,7 @@ function pcsysinstall_get_disk_info($diskname) { $disks_info = split(":", $d); $tmp_array = array(); if($disks_info[0] == $diskname) { - $disk_info = split("\n", `/PCBSD/pc-sysinstall/pc-sysinstall disk-info {$disks_info[0]}`); + $disk_info = split("\n", `/usr/sbin/pc-sysinstall/pc-sysinstall disk-info {$disks_info[0]}`); foreach($disk_info as $di) { $di_s = split("=", $di); if($di_s[0]) @@ -154,14 +154,14 @@ function pcsysinstall_get_disk_info($diskname) { // Return an array with all disks information. function installer_find_all_disks() { global $g, $fstype; - $disk = split("\n", `/PCBSD/pc-sysinstall/pc-sysinstall disk-list`); + $disk = split("\n", `/usr/sbin/pc-sysinstall/pc-sysinstall disk-list`); $disks_array = array(); foreach($disk as $d) { if(!$d) continue; $disks_info = split(":", $d); $tmp_array = array(); - $disk_info = split("\n", `/PCBSD/pc-sysinstall/pc-sysinstall disk-info {$disks_info[0]}`); + $disk_info = split("\n", `/usr/sbin/pc-sysinstall/pc-sysinstall disk-info {$disks_info[0]}`); foreach($disk_info as $di) { $di_s = split("=", $di); if($di_s[0]) |
