jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2011-05-12 17:15:36 +02:00
parent 5db57b7ac9
commit 7d9d09db67
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/skeleton/etc/inittab
View File

@ -22,10 +22,6 @@ null::sysinit:/bin/hostname -F /etc/hostname
# now run any rc scripts # now run any rc scripts
::sysinit:/etc/init.d/rcS ::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 # Put a getty on the serial port
#ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL #ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL

9
target/generic/Config.in
View File

@ -12,13 +12,10 @@ config BR2_TARGET_GENERIC_ISSUE
help help
Select system banner (/etc/issue) to be displayed at login. Select system banner (/etc/issue) to be displayed at login.
menuconfig BR2_TARGET_GENERIC_GETTY if BR2_ROOTFS_SKELETON_DEFAULT
bool "Generic serial port config"
if BR2_TARGET_GENERIC_GETTY
config BR2_TARGET_GENERIC_GETTY_PORT 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" default "ttyS0"
help help
Specify a port to run a getty (login prompt) on. 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 "57600" if BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600
default "115200" if BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200 default "115200" if BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200
endif # BR2_TARGET_GENERIC_GETTY endif # BR2_ROOTFS_SKELETON_DEFAULT
endmenu endmenu

2
target/generic/Makefile.in
View File

@ -31,7 +31,7 @@ ifneq ($(TARGET_GENERIC_ISSUE),)
TARGETS += target-generic-issue TARGETS += target-generic-issue
endif endif
ifeq ($(BR2_TARGET_GENERIC_GETTY),y) ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)
ifeq ($(BR2_PACKAGE_SYSVINIT),y) ifeq ($(BR2_PACKAGE_SYSVINIT),y)
TARGETS += target-generic-getty-sysvinit TARGETS += target-generic-getty-sysvinit
else else