diff --git a/src/etc/config.xml.sample b/src/etc/config.xml.sample
index 47aed2f3a..49f594e0d 100644
--- a/src/etc/config.xml.sample
+++ b/src/etc/config.xml.sample
@@ -216,6 +216,7 @@
https
yes
+ 1
1
1
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 816c06ec0..5f28657cc 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1776,7 +1776,7 @@ function system_login_configure($verbose = false)
$fd = fopen('/etc/ttys', 'w');
$on_off_secure_u = $serial_enabled ? 'onifconsole secure' : 'off secure';
$on_off_secure_v = $virtual_enabled ? 'on secure' : 'off secure';
- $terminal_type = 'cons25'; /* XXX standard is 'xterm' for virtual, 'vt100' for serial */
+ /* XXX serial type uses 3wire nowadays */
if (isset($config['system']['disableconsolemenu'])) {
$console_type = 'Pc';
$serial_type = 'std.' . $serialspeed;
@@ -1785,22 +1785,17 @@ function system_login_configure($verbose = false)
$serial_type = 'al.' . $serialspeed;
}
foreach ($etc_ttys_lines as $tty) {
- /* first virtual terminal */
- if (strpos($tty, 'ttyv0') === 0) {
- fwrite($fd, "ttyv0\t\"/usr/libexec/getty {$console_type}\"\t\t{$terminal_type}\t${on_off_secure_v}\n");
- continue;
- }
- /* all other virtual terminals */
- foreach (array('ttyv1', 'ttyv2', 'ttyv3', 'ttyv4', 'ttyv5', 'ttyv6', 'ttyv7') as $virtualport) {
+ /* virtual terminals */
+ foreach (array('ttyv0', 'ttyv1', 'ttyv2', 'ttyv3', 'ttyv4', 'ttyv5', 'ttyv6', 'ttyv7') as $virtualport) {
if (strpos($tty, $virtualport) === 0) {
fwrite($fd, "${virtualport}\t\"/usr/libexec/getty {$console_type}\"\t\txterm\t${on_off_secure_v}\n");
continue 2;
}
}
- /* each serial terminal */
+ /* serial terminals */
foreach (array('ttyu0', 'ttyu1', 'ttyu2', 'ttyu3') as $serialport) {
if (strpos($tty, $serialport) === 0) {
- fwrite($fd, "{$serialport}\t\"/usr/libexec/getty {$serial_type}\"\t{$terminal_type}\t{$on_off_secure_u}\n");
+ fwrite($fd, "{$serialport}\t\"/usr/libexec/getty {$serial_type}\"\tvt100\t{$on_off_secure_u}\n");
/* skip to next line in outer loop */
continue 2;
}
diff --git a/src/etc/rc.installer b/src/etc/rc.installer
index 767e4f562..446b971e9 100755
--- a/src/etc/rc.installer
+++ b/src/etc/rc.installer
@@ -28,7 +28,6 @@ sysctl net.link.ether.inet.log_arp_wrong_iface=0 >/dev/null
rm -f /tmp/install_complete
-# Start the backend in the background (must mute all the ouput)
daemon -f lua50c51 /usr/local/share/dfuibe_lua/main.lua \
/usr/local/share/dfuibe_lua/conf/BSDInstaller.lua \
/usr/local/share/dfuibe_lua/conf/FreeBSD.lua \
@@ -36,8 +35,7 @@ daemon -f lua50c51 /usr/local/share/dfuibe_lua/main.lua \
conscontrol mute on > /dev/null
-# Launch the frontend goo (must include cons25 for first boot)
-TERM=cons25 dfuife_curses -b /usr/local/share/dfuife_curses/hourglass.txt
+dfuife_curses -b /usr/local/share/dfuife_curses/hourglass.txt
conscontrol mute off > /dev/null