Commit 7d9d09db authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

target/generic: only show getty port option if default skeleton is used 



The special marker in etc/inittab might not be present with a custom
skeleton. At the same time make the option always active, remove the
hardcoded tty1/tty2 gettys and reword the option description slightly.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 5db57b7a

fs/skeleton/etc/inittab

+0 −4
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@ null::sysinit:/bin/hostname -F /etc/hostname 
# now run any rc scripts

::sysinit:/etc/init.d/rcS



# Set up a couple of getty's

tty1::respawn:/sbin/getty 38400 tty1

tty2::respawn:/sbin/getty 38400 tty2



# Put a getty on the serial port

#ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL

target/generic/Config.in

+3 −6
Original line number Diff line number Diff line
@@ -12,13 +12,10 @@ config BR2_TARGET_GENERIC_ISSUE 
       help

         Select system banner (/etc/issue) to be displayed at login.



menuconfig BR2_TARGET_GENERIC_GETTY

	bool "Generic serial port config"



if BR2_TARGET_GENERIC_GETTY

if BR2_ROOTFS_SKELETON_DEFAULT



config BR2_TARGET_GENERIC_GETTY_PORT

	string "Serial port to run a getty on"

	string "Port to run a getty (login prompt) on"

	default "ttyS0"

	help

	  Specify a port to run a getty (login prompt) on.
@@ -52,6 +49,6 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE 
	default "57600"		if BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600

	default "115200"	if BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200



endif # BR2_TARGET_GENERIC_GETTY

endif # BR2_ROOTFS_SKELETON_DEFAULT



endmenu

target/generic/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ ifneq ($(TARGET_GENERIC_ISSUE),) 
TARGETS += target-generic-issue

endif



ifeq ($(BR2_TARGET_GENERIC_GETTY),y)

ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)

ifeq ($(BR2_PACKAGE_SYSVINIT),y)

TARGETS += target-generic-getty-sysvinit

else