From 1831d3486317a6ac8a8bfd034bb133f9b0dc55e7 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Mon, 9 May 2016 09:51:51 -0300
Subject: Fix #6120

- Do not include /etc/ttys on base package, it's not supposed to be
replaced during upgrade
- Create a script /etc/rc.console_setup to make it easy to call
setup_serial_port() from shell scripts. This script will update
/etc/ttys accordingly
- Call /etc/rc.console_setup just after 2nd stage of upgrade happened
and new files are in place
---
 src/etc/rc                                         |  3 ++
 src/etc/rc.console_setup                           | 59 ++++++++++++++++++++++
 .../templates/core_pkg/base-nanobsd/exclude_files  |  1 +
 tools/templates/core_pkg/base/exclude_files        |  1 +
 4 files changed, 64 insertions(+)
 create mode 100755 src/etc/rc.console_setup

diff --git a/src/etc/rc b/src/etc/rc
index e82a5ba..b232e44 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -373,6 +373,9 @@ 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
new file mode 100755
index 0000000..b311543
--- /dev/null
+++ b/src/etc/rc.console_setup
@@ -0,0 +1,59 @@
+#!/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 2c915af..91e682b 100644
--- a/tools/templates/core_pkg/base-nanobsd/exclude_files
+++ b/tools/templates/core_pkg/base-nanobsd/exclude_files
@@ -22,6 +22,7 @@
 ./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 2c915af..91e682b 100644
--- a/tools/templates/core_pkg/base/exclude_files
+++ b/tools/templates/core_pkg/base/exclude_files
@@ -22,6 +22,7 @@
 ./etc/rc.conf
 ./etc/spwd.db
 ./etc/syslog.conf
+./etc/ttys
 ./media
 ./mnt
 ./proc
-- 
cgit v1.1