summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-05-09 10:23:12 -0300
committerRenato Botelho <renato@netgate.com>2016-05-09 10:29:07 -0300
commite7c23d826e34d3ea8cc8fde1ac8b2fd3782e999b (patch)
tree09009830a5f6d46b1b84a5ab067dfaf911c8e864
parent54f03f07225ad243acd5912f7e65e4d23e0e5342 (diff)
downloadpfsense-e7c23d826e34d3ea8cc8fde1ac8b2fd3782e999b.zip
pfsense-e7c23d826e34d3ea8cc8fde1ac8b2fd3782e999b.tar.gz
Revert "Fix #6120"
This reverts commit 1831d3486317a6ac8a8bfd034bb133f9b0dc55e7.
-rwxr-xr-xsrc/etc/rc3
-rwxr-xr-xsrc/etc/rc.console_setup59
-rw-r--r--tools/templates/core_pkg/base-nanobsd/exclude_files1
-rw-r--r--tools/templates/core_pkg/base/exclude_files1
4 files changed, 0 insertions, 64 deletions
diff --git a/src/etc/rc b/src/etc/rc
index b232e44..e82a5ba 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -373,9 +373,6 @@ echo "done."
# Second upgrade stage
/usr/local/sbin/${product}-upgrade -y -b 2
-# Reconfigure console
-/etc/rc.console_setup
-
# Run the php.ini setup file and populate
# /usr/local/etc/php.ini
/etc/rc.php_ini_setup 2>/tmp/php_errors.txt
diff --git a/src/etc/rc.console_setup b/src/etc/rc.console_setup
deleted file mode 100755
index b311543..0000000
--- a/src/etc/rc.console_setup
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/local/bin/php -f
-<?php
-/*
- rc.console_setup
-
- part of pfSense (https://www.pfsense.org)
- Copyright (c) 2016 Electric Sheep Fencing, LLC. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgment:
- "This product includes software developed by the pfSense Project
- for use in the pfSense® software distribution. (http://www.pfsense.org/).
-
- 4. The names "pfSense" and "pfSense Project" must not be used to
- endorse or promote products derived from this software without
- prior written permission. For written permission, please contact
- coreteam@pfsense.org.
-
- 5. Products derived from this software may not be called "pfSense"
- nor may "pfSense" appear in their names without prior written
- permission of the Electric Sheep Fencing, LLC.
-
- 6. Redistributions of any form whatsoever must retain the following
- acknowledgment:
-
- "This product includes software developed by the pfSense Project
- for use in the pfSense software distribution (http://www.pfsense.org/).
-
- THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
- EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once("config.inc");
-require_once("pfsense-utils.inc");
-
-setup_serial_port();
-
-?>
diff --git a/tools/templates/core_pkg/base-nanobsd/exclude_files b/tools/templates/core_pkg/base-nanobsd/exclude_files
index 91e682b..2c915af 100644
--- a/tools/templates/core_pkg/base-nanobsd/exclude_files
+++ b/tools/templates/core_pkg/base-nanobsd/exclude_files
@@ -22,7 +22,6 @@
./etc/rc.conf
./etc/spwd.db
./etc/syslog.conf
-./etc/ttys
./media
./mnt
./proc
diff --git a/tools/templates/core_pkg/base/exclude_files b/tools/templates/core_pkg/base/exclude_files
index 91e682b..2c915af 100644
--- a/tools/templates/core_pkg/base/exclude_files
+++ b/tools/templates/core_pkg/base/exclude_files
@@ -22,7 +22,6 @@
./etc/rc.conf
./etc/spwd.db
./etc/syslog.conf
-./etc/ttys
./media
./mnt
./proc
OpenPOWER on IntegriCloud