diff -urN oldtree/config-NR_TTY_DEVICES.patch newtree/config-NR_TTY_DEVICES.patch --- oldtree/config-NR_TTY_DEVICES.patch 1969-12-31 19:00:00.000000000 -0500 +++ newtree/config-NR_TTY_DEVICES.patch 2006-09-30 07:24:45.000000000 -0400 @@ -0,0 +1,62 @@ +diff -urN oldtree/drivers/char/Kconfig newtree/drivers/char/Kconfig +--- oldtree/drivers/char/Kconfig 2006-09-17 05:38:20.000000000 -0400 ++++ newtree/drivers/char/Kconfig 2006-09-17 07:01:26.000000000 -0400 +@@ -57,6 +57,20 @@ + + If unsure, say Y. + ++config NR_TTY_DEVICES ++ int "Maximum tty device number" ++ depends on VT ++ range 12 63 ++ default 63 ++ ---help--- ++ This option is used to change the number of tty devices in /dev. ++ The default value is 63. The lowest number you can set is 12, ++ 63 is also the upper limit so we don't overrun the serial ++ consoles. ++ ++ If unsure, say 63. ++ ++ + config HW_CONSOLE + bool + depends on VT && !S390 && !UML +diff -urN oldtree/include/linux/tty.h newtree/include/linux/tty.h +--- oldtree/include/linux/tty.h 2006-09-17 05:38:20.000000000 -0400 ++++ newtree/include/linux/tty.h 2006-09-17 07:05:59.000000000 -0400 +@@ -16,6 +16,15 @@ + + #include + ++/* ++ * Splashutils is evil and will not build unless we define these ++ * falsely... ++ */ ++#ifndef NR_TTY_DEVICES ++#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES ++#define MAX_NR_USER_CONSOLES CONFIG_NR_TTY_DEVICES ++#define MIN_NR_CONSOLES 1 ++#endif + + /* + * (Note: the *_driver.minor_start values 1, 64, 128, 192 are +diff -urN oldtree/include/linux/vt.h newtree/include/linux/vt.h +--- oldtree/include/linux/vt.h 2006-09-17 05:38:20.000000000 -0400 ++++ newtree/include/linux/vt.h 2006-09-17 07:01:26.000000000 -0400 +@@ -6,8 +6,12 @@ + * resizing). + */ + #define MIN_NR_CONSOLES 1 /* must be at least 1 */ +-#define MAX_NR_CONSOLES 63 /* serial lines start at 64 */ +-#define MAX_NR_USER_CONSOLES 63 /* must be root to allocate above this */ ++/* ++ * NR_TTY_DEVICES: ++ * Value MUST be at least 11 and must never be higher then 63 ++ */ ++#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES ++#define MAX_NR_USER_CONSOLES CONFIG_NR_TTY_DEVICES + /* Note: the ioctl VT_GETSTATE does not work for + consoles 16 and higher (since it returns a short) */ + +Files oldtree/scripts/kconfig/mconf and newtree/scripts/kconfig/mconf differ diff -urN oldtree/drivers/char/Kconfig newtree/drivers/char/Kconfig --- oldtree/drivers/char/Kconfig 2006-09-29 14:03:20.000000000 -0400 +++ newtree/drivers/char/Kconfig 2006-09-30 07:25:43.000000000 -0400 @@ -57,6 +57,19 @@ If unsure, say Y. +config NR_TTY_DEVICES + int "Maximum tty device number" + depends on VT + range 12 63 + default 63 + ---help--- + This option is used to change the number of tty devices in /dev. + The default value is 63. The lowest number you can set is 12, + 63 is also the upper limit so we don't overrun the serial + consoles. + + If unsure, say 63. + config HW_CONSOLE bool depends on VT && !S390 && !UML diff -urN oldtree/include/linux/vt.h newtree/include/linux/vt.h --- oldtree/include/linux/vt.h 2006-09-29 13:50:42.000000000 -0400 +++ newtree/include/linux/vt.h 2006-09-30 07:29:16.000000000 -0400 @@ -1,13 +1,25 @@ #ifndef _LINUX_VT_H #define _LINUX_VT_H +/* + * We will make this definition solely for the purpose of making packages + * such as splashutils build, because they can not understand that + * NR_TTY_DEVICES is defined in the kernel configuration. + */ +#ifndef CONFIG_NR_TTY_DEVICES +#define CONFIG_NR_TTY_DEVICES 63 +#endif /* * These constants are also useful for user-level apps (e.g., VC * resizing). */ #define MIN_NR_CONSOLES 1 /* must be at least 1 */ -#define MAX_NR_CONSOLES 63 /* serial lines start at 64 */ -#define MAX_NR_USER_CONSOLES 63 /* must be root to allocate above this */ +/* + * NR_TTY_DEVICES: + * Value MUST be at least 11 and must never be higher then 63 + */ +#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES +#define MAX_NR_USER_CONSOLES CONFIG_NR_TTY_DEVICES /* Note: the ioctl VT_GETSTATE does not work for consoles 16 and higher (since it returns a short) */