From 867432ecbc7ec153bdf01178f8f31022c718ca4a Mon Sep 17 00:00:00 2001 From: kettenis <> Date: Sun, 15 Sep 2019 12:25:40 +0000 Subject: [PATCH] Add ttyC4 to lost of devices to change when logging in on ttyC0 (and in some cases also the serial console) such that X can use it as its VT when running without root privileges. ok jsg@, matthieu@ --- src/etc/etc.amd64/fbtab | 2 +- src/etc/etc.arm64/fbtab | 2 +- src/etc/etc.hppa/fbtab | 2 +- src/etc/etc.i386/fbtab | 2 +- src/etc/etc.loongson/fbtab | 2 +- src/etc/etc.luna88k/fbtab | 6 +++--- src/etc/etc.macppc/fbtab | 2 +- src/etc/etc.octeon/fbtab | 2 +- src/etc/etc.sgi/fbtab | 2 +- src/etc/etc.sparc64/fbtab | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/etc/etc.amd64/fbtab b/src/etc/etc.amd64/fbtab index 908fc58b..0369abc7 100644 --- a/src/etc/etc.amd64/fbtab +++ b/src/etc/etc.amd64/fbtab @@ -1 +1 @@ -/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/drm0:/dev/drmR128 +/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128 diff --git a/src/etc/etc.arm64/fbtab b/src/etc/etc.arm64/fbtab index 124a1e1b..cd12fe76 100644 --- a/src/etc/etc.arm64/fbtab +++ b/src/etc/etc.arm64/fbtab @@ -1,2 +1,2 @@ /dev/tty00 0600 /dev/console -/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/drm0:/dev/drmR128 +/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128 diff --git a/src/etc/etc.hppa/fbtab b/src/etc/etc.hppa/fbtab index d0c58313..3fa584fd 100644 --- a/src/etc/etc.hppa/fbtab +++ b/src/etc/etc.hppa/fbtab @@ -1 +1 @@ -/dev/console 0600 /dev/ttyC0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg +/dev/console 0600 /dev/ttyC0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4 diff --git a/src/etc/etc.i386/fbtab b/src/etc/etc.i386/fbtab index 908fc58b..0369abc7 100644 --- a/src/etc/etc.i386/fbtab +++ b/src/etc/etc.i386/fbtab @@ -1 +1 @@ -/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/drm0:/dev/drmR128 +/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128 diff --git a/src/etc/etc.loongson/fbtab b/src/etc/etc.loongson/fbtab index 124a1e1b..cd12fe76 100644 --- a/src/etc/etc.loongson/fbtab +++ b/src/etc/etc.loongson/fbtab @@ -1,2 +1,2 @@ /dev/tty00 0600 /dev/console -/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/drm0:/dev/drmR128 +/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128 diff --git a/src/etc/etc.luna88k/fbtab b/src/etc/etc.luna88k/fbtab index 1c563cb0..bc8d56a9 100644 --- a/src/etc/etc.luna88k/fbtab +++ b/src/etc/etc.luna88k/fbtab @@ -1,3 +1,3 @@ -/dev/console 0600 /dev/ttyC0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttya:/dev/ttyCcfg -/dev/ttya 0600 /dev/ttyC0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/console:/dev/ttyCcfg -/dev/ttyC0 0600 /dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/console:/dev/ttya:/dev/ttyCcfg +/dev/console 0600 /dev/ttyC0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttya:/dev/ttyCcfg:/dev/ttyC4 +/dev/ttya 0600 /dev/ttyC0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/console:/dev/ttyCcfg:/dev/ttyC4 +/dev/ttyC0 0600 /dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/console:/dev/ttya:/dev/ttyCcfg:/dev/ttyC4 diff --git a/src/etc/etc.macppc/fbtab b/src/etc/etc.macppc/fbtab index fc5d950a..54ea4374 100644 --- a/src/etc/etc.macppc/fbtab +++ b/src/etc/etc.macppc/fbtab @@ -1,3 +1,3 @@ /dev/ttya 0600 /dev/console /dev/tty00 0600 /dev/console -/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/drm0:/dev/drmR128 +/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128 diff --git a/src/etc/etc.octeon/fbtab b/src/etc/etc.octeon/fbtab index d898c1cb..2fe7a8fe 100644 --- a/src/etc/etc.octeon/fbtab +++ b/src/etc/etc.octeon/fbtab @@ -1,2 +1,2 @@ /dev/tty00 0600 /dev/console -/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg +/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4 diff --git a/src/etc/etc.sgi/fbtab b/src/etc/etc.sgi/fbtab index d898c1cb..2fe7a8fe 100644 --- a/src/etc/etc.sgi/fbtab +++ b/src/etc/etc.sgi/fbtab @@ -1,2 +1,2 @@ /dev/tty00 0600 /dev/console -/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg +/dev/ttyC0 0600 /dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg:/dev/ttyC4 diff --git a/src/etc/etc.sparc64/fbtab b/src/etc/etc.sparc64/fbtab index 69653b46..8e9c6bb3 100644 --- a/src/etc/etc.sparc64/fbtab +++ b/src/etc/etc.sparc64/fbtab @@ -1 +1 @@ -/dev/console 0600 /dev/ttyC0:/dev/ttyD0:/dev/ttyE0:/dev/ttyF0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/tty00:/dev/ttyCcfg:/dev/drm0:/dev/drmR128 +/dev/console 0600 /dev/ttyC0:/dev/ttyD0:/dev/ttyE0:/dev/ttyF0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/tty00:/dev/ttyCcfg:/dev/ttyC4:/dev/drm0:/dev/drmR128