From 259a5b7f731f81e7be2c58b5ccda5e8978d7532c Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 18 Sep 2019 15:10:42 +0200 Subject: [PATCH] systemd: use upstream method to enable and configure debug shell With systemd-debug-generator installed we can use the standard "systemd.debug_shell" kernel command line parameter to enable the debug shell. Since systemd 243 the tty can also be changed by appending "=ttyXYZ" to that parameter. Use this method instead of enabling the debug shell on all systems by default. Signed-off-by: Matthias Reichl --- packages/sysutils/systemd/package.mk | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index ea7dcbe4d9..9f79c815ed 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -156,8 +156,19 @@ post_makeinstall_target() { safe_remove $INSTALL/usr/bin/systemd-nspawn safe_remove $INSTALL/usr/lib/systemd/system/systemd-nspawn@.service - # remove genetators/catalog - safe_remove $INSTALL/usr/lib/systemd/system-generators + # remove unneeded generators + for gen in $INSTALL/usr/lib/systemd/system-generators/*; do + case "$gen" in + */systemd-debug-generator) + # keep it + ;; + *) + safe_remove "$gen" + ;; + esac + done + + # remove catalog safe_remove $INSTALL/usr/lib/systemd/catalog # remove partition @@ -257,5 +268,4 @@ post_install() { enable_service usercache.service enable_service kernel-overlays.service enable_service hwdb.service - enable_service debug-shell.service }