I plan on unifying them as far as I can. The devil is in the details, so that will be a followup commit.
Warner On Wed, May 9, 2018 at 2:54 PM, Nathan Whitehorn <nwhiteh...@freebsd.org> wrote: > Thanks! > > At this point, these files only differ from each other in white space, > comments, and whether they have video console lines at all, which is made > unnecessary by this commit --- with the exception of sparc64, which has a > few extra off-by-default console options. Any reason not to unify them? Or > is that a follow-up commit? > -Nathan > > > On 05/09/18 13:49, Warner Losh wrote: > >> Author: imp >> Date: Wed May 9 20:49:00 2018 >> New Revision: 333436 >> URL: https://svnweb.freebsd.org/changeset/base/333436 >> >> Log: >> For video consoles, only launch a getty if the device exists. >> Differential Revision: https://reviews.freebsd.org/D15169 >> >> Modified: >> head/etc/etc.aarch64/ttys >> head/etc/etc.amd64/ttys >> head/etc/etc.arm/ttys >> head/etc/etc.i386/ttys >> head/etc/etc.powerpc/ttys >> head/etc/etc.riscv/ttys >> head/etc/etc.sparc64/ttys >> >> Modified: head/etc/etc.aarch64/ttys >> ============================================================ >> ================== >> --- head/etc/etc.aarch64/ttys Wed May 9 20:41:03 2018 (r333435) >> +++ head/etc/etc.aarch64/ttys Wed May 9 20:49:00 2018 (r333436) >> @@ -29,16 +29,16 @@ >> # when going to single-user mode. >> console none unknown off secure >> # >> -ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure >> +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure >> # Virtual terminals >> -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 -nodaemon" xterm off secure >> +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure >> +#ttyv8 "/usr/local/bin/xdm -nodaemon" xterm onifexists secure >> # Serial terminals >> # The 'dialup' keyword identifies dialin lines to login, fingerd etc. >> ttyu0 "/usr/libexec/getty 3wire" vt100 onifconsole secure >> >> Modified: head/etc/etc.amd64/ttys >> ============================================================ >> ================== >> --- head/etc/etc.amd64/ttys Wed May 9 20:41:03 2018 (r333435) >> +++ head/etc/etc.amd64/ttys Wed May 9 20:49:00 2018 (r333436) >> @@ -29,15 +29,15 @@ >> # when going to single-user mode. >> console none unknown off secure >> # >> -ttyv0 "/usr/libexec/getty Pc" xterm on secure >> +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure >> # Virtual terminals >> -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 >> +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure >> ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure >> # Serial terminals >> # The 'dialup' keyword identifies dialin lines to login, fingerd etc. >> >> Modified: head/etc/etc.arm/ttys >> ============================================================ >> ================== >> --- head/etc/etc.arm/ttys Wed May 9 20:41:03 2018 (r333435) >> +++ head/etc/etc.arm/ttys Wed May 9 20:49:00 2018 (r333436) >> @@ -29,15 +29,15 @@ >> # when going to single-user mode. >> console none unknown off secure >> # >> -ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure >> +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure >> # Virtual terminals >> -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 >> +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure >> #ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure >> # Serial terminals >> # The 'dialup' keyword identifies dialin lines to login, fingerd etc. >> >> Modified: head/etc/etc.i386/ttys >> ============================================================ >> ================== >> --- head/etc/etc.i386/ttys Wed May 9 20:41:03 2018 (r333435) >> +++ head/etc/etc.i386/ttys Wed May 9 20:49:00 2018 (r333436) >> @@ -29,15 +29,15 @@ >> # when going to single-user mode. >> console none unknown off secure >> # >> -ttyv0 "/usr/libexec/getty Pc" xterm on secure >> +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure >> # Virtual terminals >> -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 >> +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure >> ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure >> # Serial terminals >> # The 'dialup' keyword identifies dialin lines to login, fingerd etc. >> >> Modified: head/etc/etc.powerpc/ttys >> ============================================================ >> ================== >> --- head/etc/etc.powerpc/ttys Wed May 9 20:41:03 2018 (r333435) >> +++ head/etc/etc.powerpc/ttys Wed May 9 20:49:00 2018 (r333436) >> @@ -29,15 +29,15 @@ >> # when going to single-user mode. >> console none unknown off secure >> # >> -ttyv0 "/usr/libexec/getty Pc" xterm on secure >> +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure >> # Virtual terminals >> -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 >> +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure >> #ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure >> # Serial terminals >> # The 'dialup' keyword identifies dialin lines to login, fingerd etc. >> >> Modified: head/etc/etc.riscv/ttys >> ============================================================ >> ================== >> --- head/etc/etc.riscv/ttys Wed May 9 20:41:03 2018 (r333435) >> +++ head/etc/etc.riscv/ttys Wed May 9 20:49:00 2018 (r333436) >> @@ -29,16 +29,16 @@ >> # when going to single-user mode. >> console none unknown off secure >> # >> -ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure >> +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure >> # Virtual terminals >> -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 -nodaemon" xterm off secure >> +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure >> +#ttyv8 "/usr/local/bin/xdm -nodaemon" xterm onifexists secure >> # Serial terminals >> # The 'dialup' keyword identifies dialin lines to login, fingerd etc. >> ttyu0 "/usr/libexec/getty 3wire" vt100 onifconsole secure >> >> Modified: head/etc/etc.sparc64/ttys >> ============================================================ >> ================== >> --- head/etc/etc.sparc64/ttys Wed May 9 20:41:03 2018 (r333435) >> +++ head/etc/etc.sparc64/ttys Wed May 9 20:49:00 2018 (r333436) >> @@ -33,15 +33,15 @@ screen "/usr/libexec/getty Pc" vt100 >> off secure >> ttya "/usr/libexec/getty 3wire.9600" vt100 off secure >> ttyb "/usr/libexec/getty 3wire.9600" vt100 off secure >> # syscons(4) >> -ttyv0 "/usr/libexec/getty Pc" xterm on secure >> +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure >> # Virtual terminals >> -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 >> +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure >> +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure >> ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure >> # Serial terminals >> # The 'dialup' keyword identifies dialin lines to login, fingerd etc. >> >> > _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
