From 368f00cc58e498df0c2a554111fb4aef87999920 Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 13 Nov 2009 11:32:14 +0000 Subject: 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. --- release/picobsd/floppy.tree/etc/ttys | 22 +++++++++++----------- release/picobsd/tinyware/oinit/oinit.c | 4 ++-- tools/tools/nanobsd/rescue/Files/etc/ttys | 18 +++++++++--------- tools/tools/tinybsd/conf/wrap/etc/ttys | 28 ++++++++++++++-------------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/release/picobsd/floppy.tree/etc/ttys b/release/picobsd/floppy.tree/etc/ttys index dcfac7a..09f42fb 100644 --- a/release/picobsd/floppy.tree/etc/ttys +++ b/release/picobsd/floppy.tree/etc/ttys @@ -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 diff --git a/release/picobsd/tinyware/oinit/oinit.c b/release/picobsd/tinyware/oinit/oinit.c index b02434a..7715f3e 100644 --- a/release/picobsd/tinyware/oinit/oinit.c +++ b/release/picobsd/tinyware/oinit/oinit.c @@ -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 **argv) 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); diff --git a/tools/tools/nanobsd/rescue/Files/etc/ttys b/tools/tools/nanobsd/rescue/Files/etc/ttys index c62941f..8e72947 100644 --- a/tools/tools/nanobsd/rescue/Files/etc/ttys +++ b/tools/tools/nanobsd/rescue/Files/etc/ttys @@ -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. diff --git a/tools/tools/tinybsd/conf/wrap/etc/ttys b/tools/tools/tinybsd/conf/wrap/etc/ttys index d20b7eb..919bcea 100644 --- a/tools/tools/tinybsd/conf/wrap/etc/ttys +++ b/tools/tools/tinybsd/conf/wrap/etc/ttys @@ -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 -- cgit v1.1