summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/etc/inc/pfsense-utils.inc4
-rw-r--r--src/etc/pfSense.obsoletedfiles1
-rw-r--r--src/etc/phpshellsessions/gitsync2
-rwxr-xr-xsrc/etc/rc.initial.firmware_update2
-rwxr-xr-xsrc/etc/rc.php_ini_setup52
-rw-r--r--src/usr/local/www/system_advanced_admin.php4
-rwxr-xr-xsrc/usr/local/www/system_firmware_auto.php2
-rw-r--r--src/usr/local/www/system_firmware_check.php2
-rw-r--r--src/usr/local/www/widgets/widgets/system_information.widget.php2
9 files changed, 17 insertions, 54 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index 2cedc52..be66e8b 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -1002,7 +1002,7 @@ function setup_serial_port($when="save", $path="") {
if ($g['platform'] != "cdrom") {
$serial_only = false;
- if (($g['platform'] == "nanobsd") && !file_exists("/etc/nano_use_vga.txt")) {
+ if (($g['platform'] == "nanobsd") && isset($g['enableserial_force'])) {
$serial_only = true;
} else {
$specific_platform = system_identify_specific_platform();
@@ -1122,7 +1122,7 @@ function is_serial_enabled() {
if (!isset($g['enableserial_force']) &&
!isset($config['system']['enableserial']) &&
- ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || file_exists("/etc/nano_use_vga.txt"))) {
+ ($g['platform'] == "pfSense" || $g['platform'] == "cdrom")) {
return false;
}
diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles
index cae1bcf..a6ba2bc 100644
--- a/src/etc/pfSense.obsoletedfiles
+++ b/src/etc/pfSense.obsoletedfiles
@@ -23,6 +23,7 @@
/etc/manpath.config
/etc/mtree/BSD.x11-4.dist
/etc/mtree/BSD.x11.dist
+/etc/nano_use_vga.txt
/etc/ntp.conf
/etc/pccard.conf
/etc/periodic/daily/130.clean-msgs
diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync
index f500e9a..9f2e56b 100644
--- a/src/etc/phpshellsessions/gitsync
+++ b/src/etc/phpshellsessions/gitsync
@@ -20,7 +20,7 @@ $GITSYNC_MERGE = "/root/.gitsync_merge";
/* NOTE: Set branches here */
$branches = array(
- "master" => "2.2 development branch",
+ "master" => "2.3 development branch",
"build_commit" => "The commit originally used to build the image",
"bootstrap" => "Bootstrap branch"
);
diff --git a/src/etc/rc.initial.firmware_update b/src/etc/rc.initial.firmware_update
index 2dff066..143dbbd 100755
--- a/src/etc/rc.initial.firmware_update
+++ b/src/etc/rc.initial.firmware_update
@@ -19,7 +19,7 @@ if (isset($config['system']['firmware']['alturl']['enable'])) {
$nanosize = "";
if ($g['platform'] == "nanobsd") {
- if (file_exists("/etc/nano_use_vga.txt")) {
+ if (!isset($g['enableserial_force'])) {
$nanosize = "-nanobsd-vga-";
} else {
$nanosize = "-nanobsd-";
diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup
index 0013b58..3d53233 100755
--- a/src/etc/rc.php_ini_setup
+++ b/src/etc/rc.php_ini_setup
@@ -90,9 +90,6 @@ fi
# Define php modules. Do not add .so, it will
# be done automatically by the script below.
PHPMODULES="standard"
-if [ "$LOWMEM" != "TRUE" ]; then
- PHPMODULES="$PHPMODULES opcache"
-fi
# Config read/write
PHPMODULES="$PHPMODULES xml libxml dom"
PHPMODULES="$PHPMODULES SimpleXML xmlreader xmlwriter"
@@ -140,8 +137,11 @@ PHPMODULES="$PHPMODULES bcmath"
# filter
PHPMODULES="$PHPMODULES filter"
-PHP_ZEND_MODULES="ioncube_loader"
-PHP_ZEND_MODULES_TS="ioncube_loader_ts"
+PHP_ZEND_MODULES=""
+
+if [ "$LOWMEM" != "TRUE" ]; then
+ PHP_ZEND_MODULES="$PHP_ZEND_MODULES opcache"
+fi
# Modules previously included.
# can be turned on by touching
@@ -206,35 +206,6 @@ EOF
# Copy php.ini file to etc/ too (cli)
/bin/cp /usr/local/lib/php.ini /usr/local/etc/php.ini
-# Ensure directory exists
-if [ ! -d /etc/php_dynamodules ]; then
- /bin/mkdir /etc/php_dynamodules
-fi
-if [ ! -d /etc/php_dynamodules_zend ]; then
- /bin/mkdir /etc/php_dynamodules_zend
-fi
-if [ ! -d /etc/php_dynamodules_zend_ts ]; then
- /bin/mkdir /etc/php_dynamodules_zend_ts
-fi
-
-# Read in dynamodules
-if [ -d /etc/php_dynamodules ]; then
- DYNA_MODULES=`/bin/ls -Utr /etc/php_dynamodules/`
- PHPMODULES="$PHPMODULES $DYNA_MODULES"
-fi
-
-# Read in zend modules
-if [ -d /etc/php_dynamodules_zend ]; then
- DYNA_MODULES=`/bin/ls /etc/php_dynamodules_zend/`
- PHP_ZEND_MODULES="$PHP_ZEND_MODULES $DYNA_MODULES"
-fi
-
-# Read in zend threaded modules
-if [ -d /etc/php_dynamodules_zend_ts ]; then
- DYNA_MODULES=`/bin/ls /etc/php_dynamodules_zend_ts/`
- PHP_ZEND_MODULES_TS="$PHP_ZEND_MODULES_TS $DYNA_MODULES"
-fi
-
# Loop through and generate modules to load.
# Take into account modules built into php.
for EXT in $PHPMODULES; do
@@ -256,20 +227,11 @@ done
# Zend modules
for EXT in $PHP_ZEND_MODULES; do
# Ensure extension exists before adding.
- if [ -f "${EXTENSIONSDIR}/ioncube/${EXT}.so" ]; then
- echo "zend_extension=${EXTENSIONSDIR}/ioncube/${EXT}.so" >> /usr/local/lib/php.ini
+ if [ -f "${EXTENSIONSDIR}${EXT}.so" ]; then
+ echo "zend_extension=${EXT}.so" >> /usr/local/lib/php.ini
fi
done
-# Zend threaded modules
-for EXT in $PHP_ZEND_MODULES_TS; do
- # Ensure extension exists before adding.
- if [ -f "${EXTENSIONSDIR}/ioncube/${EXT}.so" ]; then
- echo "zend_extension_ts=${EXTENSIONSDIR}/ioncube/${EXT}.so" >> /usr/local/lib/php.ini
- fi
-done
-
-
if [ "$LOWMEM" != "TRUE" ]; then
/bin/cat >>/usr/local/lib/php.ini <<EOF
diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php
index e81a957..2520b1b 100644
--- a/src/usr/local/www/system_advanced_admin.php
+++ b/src/usr/local/www/system_advanced_admin.php
@@ -474,7 +474,7 @@ $section->addInput(new Form_Input(
))->setHelp('Note: Leave this blank for the default of 22.');
-if (!$g['enableserial_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom" || file_exists("/etc/nano_use_vga.txt")))
+if (!$g['enableserial_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom"))
{
$form->add($section);
$section = new Form_Section('Serial Communications');
@@ -569,4 +569,4 @@ if ($restart_webgui)
flush();
log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator."));
send_event("service restart webgui");
-} \ No newline at end of file
+}
diff --git a/src/usr/local/www/system_firmware_auto.php b/src/usr/local/www/system_firmware_auto.php
index d57d8d0..0d01fa3 100755
--- a/src/usr/local/www/system_firmware_auto.php
+++ b/src/usr/local/www/system_firmware_auto.php
@@ -91,7 +91,7 @@ panel_heading_class('info');
$nanosize = "";
if ($g['platform'] == "nanobsd") {
- if (file_exists("/etc/nano_use_vga.txt")) {
+ if (!isset($g['enableserial_force'])) {
$nanosize = "-nanobsd-vga-";
} else {
$nanosize = "-nanobsd-";
diff --git a/src/usr/local/www/system_firmware_check.php b/src/usr/local/www/system_firmware_check.php
index c2cc9a1..e1032d5 100644
--- a/src/usr/local/www/system_firmware_check.php
+++ b/src/usr/local/www/system_firmware_check.php
@@ -86,7 +86,7 @@ $static_text .= gettext("Downloading new version information...");
$nanosize = "";
if ($g['platform'] == "nanobsd") {
- if (file_exists("/etc/nano_use_vga.txt")) {
+ if (!isset($g['enableserial_force'])) {
$nanosize = "-nanobsd-vga-";
} else {
$nanosize = "-nanobsd-";
diff --git a/src/usr/local/www/widgets/widgets/system_information.widget.php b/src/usr/local/www/widgets/widgets/system_information.widget.php
index c9aab04..d00b127 100644
--- a/src/usr/local/www/widgets/widgets/system_information.widget.php
+++ b/src/usr/local/www/widgets/widgets/system_information.widget.php
@@ -49,7 +49,7 @@ if ($_REQUEST['getupdatestatus']) {
$nanosize = "";
if ($g['platform'] == "nanobsd") {
- if (file_exists("/etc/nano_use_vga.txt")) {
+ if (!isset($g['enableserial_force'])) {
$nanosize = "-nanobsd-vga-";
} else {
$nanosize = "-nanobsd-";
OpenPOWER on IntegriCloud