Commit 5c0a2450 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "tty: Set correct tty name in 'active' sysfs attribute"

This reverts commit d8a5dc30.

This breaks plymouth installs, either because plymouth is using the file
"incorrectly" or because the patch is incorrect.  Either way, this needs
to be reverted until it is all figured out.
Reported-by: default avatarJosh Boyer <jwboyer@fedoraproject.org>
Reported-by: default avatarRay Strode <halfline@gmail.com>
Cc: Lennart Poettering <lennart@poettering.net>
Cc: Kay Sievers <kay@vrfy.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: Werner Fink <werner@suse.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6d0abeca
...@@ -3,8 +3,7 @@ Date: Nov 2010 ...@@ -3,8 +3,7 @@ Date: Nov 2010
Contact: Kay Sievers <kay.sievers@vrfy.org> Contact: Kay Sievers <kay.sievers@vrfy.org>
Description: Description:
Shows the list of currently configured Shows the list of currently configured
tty devices used for the console, console devices, like 'tty1 ttyS0'.
like 'tty1 ttyS0'.
The last entry in the file is the active The last entry in the file is the active
device connected to /dev/console. device connected to /dev/console.
The file supports poll() to detect virtual The file supports poll() to detect virtual
......
...@@ -1267,17 +1267,16 @@ static void pty_line_name(struct tty_driver *driver, int index, char *p) ...@@ -1267,17 +1267,16 @@ static void pty_line_name(struct tty_driver *driver, int index, char *p)
* @p: output buffer of at least 7 bytes * @p: output buffer of at least 7 bytes
* *
* Generate a name from a driver reference and write it to the output * Generate a name from a driver reference and write it to the output
* buffer. Return the number of bytes written. * buffer.
* *
* Locking: None * Locking: None
*/ */
static ssize_t tty_line_name(struct tty_driver *driver, int index, char *p) static void tty_line_name(struct tty_driver *driver, int index, char *p)
{ {
if (driver->flags & TTY_DRIVER_UNNUMBERED_NODE) if (driver->flags & TTY_DRIVER_UNNUMBERED_NODE)
return sprintf(p, "%s", driver->name); strcpy(p, driver->name);
else else
return sprintf(p, "%s%d", driver->name, sprintf(p, "%s%d", driver->name, index + driver->name_base);
index + driver->name_base);
} }
/** /**
...@@ -3546,19 +3545,9 @@ static ssize_t show_cons_active(struct device *dev, ...@@ -3546,19 +3545,9 @@ static ssize_t show_cons_active(struct device *dev,
if (i >= ARRAY_SIZE(cs)) if (i >= ARRAY_SIZE(cs))
break; break;
} }
while (i--) { while (i--)
struct tty_driver *driver; count += sprintf(buf + count, "%s%d%c",
const char *name = cs[i]->name; cs[i]->name, cs[i]->index, i ? ' ':'\n');
int index = cs[i]->index;
driver = cs[i]->device(cs[i], &index);
if (driver) {
count += tty_line_name(driver, index, buf + count);
count += sprintf(buf + count, "%c", i ? ' ':'\n');
} else
count += sprintf(buf + count, "%s%d%c",
name, index, i ? ' ':'\n');
}
console_unlock(); console_unlock();
return count; return count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment