Project

General

Profile

« Previous | Next » 

Revision d4b1e549

Added by Renato Botelho about 11 years ago

Back to cons25 for now since we found some issues with xterm on serial console

View differences:

etc/inc/pfsense-utils.inc
990 990 
	}
991 991 
	foreach($ttys_split as $tty) {
992 992 
		if (stristr($tty, "ttyv0"))
993 
			fwrite($fd, "ttyv0	\"/usr/libexec/getty {$console_type}\"	xterm	on	secure\n");
993 
			fwrite($fd, "ttyv0	\"/usr/libexec/getty {$console_type}\"	cons25	on	secure\n");
994 994 
		else if (stristr($tty, "ttyu0"))
995 
			fwrite($fd, "ttyu0	\"/usr/libexec/getty {$serial_type}\"	xterm	{$on_off}	secure\n");
995 
			fwrite($fd, "ttyu0	\"/usr/libexec/getty {$serial_type}\"	cons25	{$on_off}	secure\n");
996 996 
		else
997 997 
			fwrite($fd, $tty . "\n");
998 998 
	}
etc/rc.bootup
61 61 
	}
62 62 
	// If R or I was pressed do our logic here
63 63 
	if (in_array($key, array("r", "R"))) {
64 
	  putenv("TERM=xterm");
64 
	  putenv("TERM=cons25");
65 65 
	  echo "\n\nRecovery mode selected...\n";
66 
	  passthru("/usr/bin/env TERM=xterm /bin/tcsh -c /scripts/lua_installer_rescue");
66 
	  passthru("/usr/bin/env TERM=cons25 /bin/tcsh -c /scripts/lua_installer_rescue");
67 67 
	} elseif (in_array($key, array("i", "I"))) {
68 
	  putenv("TERM=xterm");
68 
	  putenv("TERM=cons25");
69 69 
	  echo "\n\nInstaller mode selected...\n";
70 
	  passthru("/usr/bin/env TERM=xterm /bin/tcsh -c /scripts/lua_installer");
70 
	  passthru("/usr/bin/env TERM=cons25 /bin/tcsh -c /scripts/lua_installer");
71 71 
	  if(file_exists("/tmp/install_complete")) {
72 72 
		passthru("/etc/rc.reboot");
73 73 
		exit;
74 74 
	  }
75 75 
	} elseif (in_array($key, array("!", "~"))) {
76 
		putenv("TERM=xterm");
76 
		putenv("TERM=cons25");
77 77 
		echo "\n\nRecovery shell selected...\n";
78 78 
		echo "\n";
79 79 
		touch("/tmp/donotbootup");
etc/rc.initial
161 161 
		;;
162 162 
99)
163 163 
		if [ -e /dev/ukbd0 ]; then
164 
			env TERM=xterm /scripts/lua_installer
164 
			env TERM=cons25 /scripts/lua_installer
165 165 
		else
166 166 
			/scripts/lua_installer
167 167 
		fi
etc/ttys
29 29 
# when going to single-user mode.
30 30 
console	none				unknown	off secure
31 31 
#
32 
ttyv0	"/usr/libexec/getty al.Pc"		xterm	on  secure
32 
ttyv0	"/usr/libexec/getty al.Pc"	cons25	on  secure
33 33 
# Virtual terminals
34 34 
ttyv1	"/usr/libexec/getty Pc"		xterm	off secure
35 35 
ttyv2	"/usr/libexec/getty Pc"		xterm	off secure
......
41 41 
ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
42 42 
# Serial terminals
43 43 
# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
44 
ttyu0	"/usr/libexec/getty al.115200"	xterm	on  secure
44 
ttyu0	"/usr/libexec/getty al.115200"	cons25	on  secure
45 45 
ttyu1	"/usr/libexec/getty std.9600"	dialup	off secure
46 46 
ttyu2	"/usr/libexec/getty std.9600"	dialup	off secure
47 47 
ttyu3	"/usr/libexec/getty std.9600"	dialup	off secure
root/.profile
1 1 
# Detect interactive logins and display the shell
2 
if [ -n "${SSH_TTY}" -o "${TERM}" = "xterm" ]; then
2 
if [ -n "${SSH_TTY}" -o "${TERM}" = "cons25" ]; then
3 3 
	/etc/rc.initial
4 4 
	exit
5 5 
fi
root/.shrc
1 1 
# Detect interactive logins and display the shell
2 
if [ -n "${SSH_TTY}" -o "${TERM}" = "xterm" ]; then
2 
if [ -n "${SSH_TTY}" -o "${TERM}" = "cons25" ]; then
3 3 
	/etc/rc.initial
4 4 
	exit
5 5 
fi
tmp/post_upgrade_command
9 9 
fi
10 10 

  		




  11
  11
  
    
# Detect interactive logins and display the shell


  		




  12
  
  
    
detect_command='[ -n "$SSH_TTY" -o "$TERM" = "xterm" ] && exec /etc/rc.initial'


  		




  
  12
  
    
detect_command='[ -n "$SSH_TTY" -o "$TERM" = "cons25" ] && exec /etc/rc.initial'


  		




  13
  13
  
    
echo "$detect_command" > $CVS_CO_DIR/root/.shrc


  		




  14
  14
  
    
echo "$detect_command" >> $CVS_CO_DIR/root/.profile


  		




  15
  15
  
    

  		












Also available in:  Unified diff