Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Nov 2009 11:32:14 +0000 (UTC)
From:      Ed Schouten <ed@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r199251 - in head: release/picobsd/floppy.tree/etc release/picobsd/tinyware/oinit tools/tools/nanobsd/rescue/Files/etc tools/tools/tinybsd/conf/wrap/etc
Message-ID:  <200911131132.nADBWEJ6064892@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ed
Date: Fri Nov 13 11:32:14 2009
New Revision: 199251
URL: http://svn.freebsd.org/changeset/base/199251

Log:
  Convert {small prefix}BSD to TERM=xterm as well.
  
  Clean up the ttys files shipped with PicoBSD, NanoBSD and TinyBSD. While
  there, it seems one of them still had references to sio(4). Make it in
  sync with what we do in the base system.

Modified:
  head/release/picobsd/floppy.tree/etc/ttys
  head/release/picobsd/tinyware/oinit/oinit.c
  head/tools/tools/nanobsd/rescue/Files/etc/ttys
  head/tools/tools/tinybsd/conf/wrap/etc/ttys

Modified: head/release/picobsd/floppy.tree/etc/ttys
==============================================================================
--- head/release/picobsd/floppy.tree/etc/ttys	Fri Nov 13 11:28:54 2009	(r199250)
+++ head/release/picobsd/floppy.tree/etc/ttys	Fri Nov 13 11:32:14 2009	(r199251)
@@ -8,19 +8,19 @@
 # This entry needed for asking password when init goes to single-user mode
 # If you want to be asked for password, change "secure" to "insecure" here
 #console	none				unknown	off secure
-vga	none				cons25	off secure
+vga	none				xterm	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv8	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv9	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
+#ttyv8	"/usr/libexec/getty Pc"		xterm	on  secure
+#ttyv9	"/usr/libexec/getty Pc"		xterm	on  secure
 # Pseudo terminals
 ttyp0	none			network secure
 ttyp1	none			network secure

Modified: head/release/picobsd/tinyware/oinit/oinit.c
==============================================================================
--- head/release/picobsd/tinyware/oinit/oinit.c	Fri Nov 13 11:28:54 2009	(r199250)
+++ head/release/picobsd/tinyware/oinit/oinit.c	Fri Nov 13 11:32:14 2009	(r199251)
@@ -116,7 +116,7 @@ struct command bltins[]={
 	{"cd","Change working directory","cd [dir]","cd /etc",cd},
 	{"pwd","Print current directory","pwd","pwd",pwd},
 	{"exit","Exit from shell()","exit","exit",xit},
-	{"set","Set environment variable","set [VAR=value]","set TERM=cons25",set},
+	{"set","Set environment variable","set [VAR=value]","set TERM=xterm",set},
 	{"unset","Unset environment variable","unset VAR","unset EDITOR",unset},
 	{"echo","Echo arguments on stdout","echo arg1 arg2 ...","echo Hello World!",echo},
 	{"env","Print all environment variables","env","env",env},
@@ -572,7 +572,7 @@ start_session(int vty, int argc, char **
 	if(fd>2) close(fd);
 	login_tty(fd);
 	setpgid(0,getpid());
-	putenv("TERM=cons25");
+	putenv("TERM=xterm");
 	putenv("HOME=/");
 	putenv("PATH=/stand:/bin:/usr/bin:/sbin:.");
 	signal(SIGHUP,SIG_DFL);

Modified: head/tools/tools/nanobsd/rescue/Files/etc/ttys
==============================================================================
--- head/tools/tools/nanobsd/rescue/Files/etc/ttys	Fri Nov 13 11:28:54 2009	(r199250)
+++ head/tools/tools/nanobsd/rescue/Files/etc/ttys	Fri Nov 13 11:32:14 2009	(r199251)
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25, but
+#      For virtual consoles, the correct type is typically xterm, but
 #      vt220 will work better if you need interoperability with other
 #      systems like Solaris or GNU/Linux.
 #      Other common values include network for network connections on
@@ -32,15 +32,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	off  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	off secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

Modified: head/tools/tools/tinybsd/conf/wrap/etc/ttys
==============================================================================
--- head/tools/tools/tinybsd/conf/wrap/etc/ttys	Fri Nov 13 11:28:54 2009	(r199250)
+++ head/tools/tools/tinybsd/conf/wrap/etc/ttys	Fri Nov 13 11:32:14 2009	(r199251)
@@ -14,7 +14,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25, but
+#      For virtual consoles, the correct type is typically xterm, but
 #      vt220 will work better if you need interoperability with other
 #      systems like Solaris or GNU/Linux.
 #      Other common values include network for network connections on
@@ -31,22 +31,22 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	off  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	off secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv8	"/usr/X11R6/bin/xdm -nodaemoff"	xterm	off secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv8	"/usr/local/bin/xdm -nodaemoff"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyd0	"/usr/libexec/getty std.9600"	dialup	on secure
-ttyd1	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyd2	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyd3	"/usr/libexec/getty std.9600"	dialup	off secure
+ttyu0	"/usr/libexec/getty std.9600"	dialup	on  secure
+ttyu1	"/usr/libexec/getty std.9600"	dialup	off secure
+ttyu2	"/usr/libexec/getty std.9600"	dialup	off secure
+ttyu3	"/usr/libexec/getty std.9600"	dialup	off secure
 # Dumb console
 dcons	"/usr/libexec/getty std.9600"	vt100	off secure
 # Pseudo terminals



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911131132.nADBWEJ6064892>