From 478355980e80eecab90fe586f2ce7a49738c9839 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Wed, 11 Oct 2023 12:04:28 +0200 Subject: [PATCH] Update default.conf In default.conf describe what it means when the user specifies USE_SERIAL_CONSOLE="yes" or USE_SERIAL_CONSOLE="no". Fixed a false description that SERIAL_CONSOLE_DEVICE_SYSLINUX and SERIAL_CONSOLE_DEVICE_GRUB work when USE_SERIAL_CONSOLE is not specified as 'no' because actually SERIAL_CONSOLE_DEVICE_SYSLINUX and SERIAL_CONSOLE_DEVICE_GRUB work when USE_SERIAL_CONSOLE is 'yes'. --- usr/share/rear/conf/default.conf | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf index 3cb6ab09bd..ecb8c890bf 100644 --- a/usr/share/rear/conf/default.conf +++ b/usr/share/rear/conf/default.conf @@ -3296,8 +3296,14 @@ SIMPLIFY_TEAMING=no # When 'getty' or 'agetty' and 'stty' can be found # and there is a 'console=...' option in /proc/cmdline, # then USE_SERIAL_CONSOLE is automatically set to 'yes'. -# Specify 'yes' or 'no' or leave it empty to use ReaR's automatism: +# With USE_SERIAL_CONSOLE="no" no serial console gets set up, +# neither for the recovery system kernel nor for the recovery system bootloader. +# With USE_SERIAL_CONSOLE="yes" plus appropriate SERIAL_CONSOLE_DEVICE... settings +# serial consoles can be specified for the recovery system kernel and bootloader +# when there is no 'console=...' option in /proc/cmdline. +# By default (when empty) the below further described automatism is used: USE_SERIAL_CONSOLE= +# # Which serial devices should be used for serial consoles # provided USE_SERIAL_CONSOLE is not set to 'no': # E.g. SERIAL_CONSOLE_DEVICES="/dev/ttyS0 /dev/ttyS1" @@ -3305,6 +3311,7 @@ USE_SERIAL_CONSOLE= # that exist as /dev/ttyS* or /dev/hvsi* character device nodes are used # (which excludes /dev/tty0 when there is 'console=tty0' in /proc/cmdline): SERIAL_CONSOLE_DEVICES= +# # Serial consoles for the kernel of the recovery system # provided USE_SERIAL_CONSOLE is not set to 'no': # By default (when SERIAL_CONSOLE_DEVICES_KERNEL and SERIAL_CONSOLE_DEVICES are empty) @@ -3316,22 +3323,25 @@ SERIAL_CONSOLE_DEVICES= # When SERIAL_CONSOLE_DEVICES_KERNEL is empty but SERIAL_CONSOLE_DEVICES is specified # then the specified SERIAL_CONSOLE_DEVICES are used for the kernel: SERIAL_CONSOLE_DEVICES_KERNEL= +# # Serial console for SYSLINUX/EXTLINUX when it is used as bootloader for the recovery system -# provided USE_SERIAL_CONSOLE is not set to 'no': +# provided USE_SERIAL_CONSOLE is 'yes': # SYSLINUX supports only one serial device (because the last SYSLINUX 'serial' directive wins). # The right /dev/ttyS* can be specified like SERIAL_CONSOLE_DEVICE_SYSLINUX="/dev/ttyS0" # or a whole SYSLINUX 'serial' directive can be specified e.g. for /dev/ttyS1 like # SERIAL_CONSOLE_DEVICE_SYSLINUX="serial 1 9600" # By default (when empty) the first one of SERIAL_CONSOLE_DEVICES is used for SYSLINUX: SERIAL_CONSOLE_DEVICE_SYSLINUX= +# # Serial console for GRUB when it is used as bootloader for the recovery system -# provided USE_SERIAL_CONSOLE is not set to 'no': +# provided USE_SERIAL_CONSOLE is 'yes': # GRUB supports only one serial device (because the last GRUB 'serial' command wins). # The right /dev/ttyS* can be specified like SERIAL_CONSOLE_DEVICE_GRUB="/dev/ttyS0" # or a whole GRUB 'serial' command can be specified e.g. for /dev/ttyS1 like # SERIAL_CONSOLE_DEVICE_GRUB="serial --unit=1 --speed=9600" # By default (when empty) the first one of SERIAL_CONSOLE_DEVICES is used for GRUB: SERIAL_CONSOLE_DEVICE_GRUB= +# # Example of the default behaviour: # Provided USE_SERIAL_CONSOLE is not specified as 'no' # and 'getty' or 'agetty' and 'stty' can be found,