Skip to content

Commit

Permalink
systemd: enable switch debug-tty to provide a debug console
Browse files Browse the repository at this point in the history
This allows us to use the default debug-shell.service provided
by systemd and cut down on custom made services. This will also
always provide a debug shell as there is no reason we shouldn't
have access to one.
  • Loading branch information
lrusak committed May 8, 2019
1 parent 4a82fd0 commit ec17cea
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 100 deletions.
2 changes: 2 additions & 0 deletions distributions/LibreELEC/options
Original file line number Diff line number Diff line change
Expand Up @@ -225,3 +225,5 @@
# IR remote keymaps supported in default config
IR_REMOTE_KEYMAPS="rc6_mce xbox_360 xbox_one"

# debug tty path
DEBUG_TTY="/dev/tty3"
1 change: 0 additions & 1 deletion packages/sysutils/busybox/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ post_install() {
add_user nobody x 65534 65534 "Nobody" "/" "/bin/sh"
add_group nogroup 65534

enable_service debug-shell.service
enable_service shell.service
enable_service show-version.service
enable_service var.mount
Expand Down
25 changes: 0 additions & 25 deletions packages/sysutils/busybox/system.d/debug-shell.service

This file was deleted.

7 changes: 3 additions & 4 deletions packages/sysutils/systemd/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
-Dzshcompletiondir=no \
-Dkmod-path=/usr/bin/kmod \
-Dmount-path=/usr/bin/mount \
-Dumount-path=/usr/bin/umount"
-Dumount-path=/usr/bin/umount \
-Ddebug-tty=$DEBUG_TTY"

pre_configure_target() {
export CFLAGS="$CFLAGS -fno-schedule-insns -fno-schedule-insns2 -Wno-format-truncation"
Expand Down Expand Up @@ -127,9 +128,6 @@ post_makeinstall_target() {
safe_remove $INSTALL/usr/lib/udev/rules.d/71-seat.rules
safe_remove $INSTALL/usr/lib/udev/rules.d/73-seat-late.rules

# remove debug-shell.service, we install our own
safe_remove $INSTALL/usr/lib/systemd/system/debug-shell.service

# remove getty units, we dont want a console
safe_remove $INSTALL/usr/lib/systemd/system/[email protected]
safe_remove $INSTALL/usr/lib/systemd/system/console-getty.service
Expand Down Expand Up @@ -258,4 +256,5 @@ post_install() {
enable_service usercache.service
enable_service kernel-overlays.service
enable_service hwdb.service
enable_service debug-shell.service
}

This file was deleted.

4 changes: 4 additions & 0 deletions projects/Allwinner/options
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,7 @@

# build with installer (yes / no)
INSTALLER_SUPPORT="no"

# debug tty path
DEBUG_TTY="/dev/console"

This file was deleted.

3 changes: 3 additions & 0 deletions projects/RPi/options
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,6 @@
# for a list of additional drivers see packages/linux-driver-addons
# Space separated list is supported,
DRIVER_ADDONS="crazycat dvb-latest"

# debug tty path
DEBUG_TTY="/dev/console"

This file was deleted.

3 changes: 3 additions & 0 deletions projects/Rockchip/options
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,6 @@
# for a list of additinoal drivers see packages/linux-driver-addons
# Space separated list is supported,
DRIVER_ADDONS="crazycat dvb-latest"

# debug tty path
DEBUG_TTY="/dev/ttyS2"

0 comments on commit ec17cea

Please sign in to comment.