Control: tags 1039251 + patch
Control: tags 1039251 + pending

Dear maintainer,

I've prepared an NMU for linuxlogo (versioned as 6.01-0.3) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should cancel it.

Regards,
Nadzeya
diffstat for linuxlogo-6.01 linuxlogo-6.01

 changelog              |   11 +++++++++++
 linuxlogo-update-issue |   27 +++++++++++++++++++++++++++
 linuxlogo.init         |   11 +----------
 linuxlogo.install      |    1 +
 linuxlogo.postinst     |    9 ++-------
 linuxlogo.service      |   15 +++++++++++++++
 6 files changed, 57 insertions(+), 17 deletions(-)

diff -Nru linuxlogo-6.01/debian/changelog linuxlogo-6.01/debian/changelog
--- linuxlogo-6.01/debian/changelog	2026-05-18 18:44:58.000000000 +0200
+++ linuxlogo-6.01/debian/changelog	2026-09-25 18:53:41.000000000 +0200
@@ -1,3 +1,14 @@
+linuxlogo (6.01-0.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add a native systemd service, as systemd-sysv-generator was removed
+    upstream in systemd v260 (Closes: #1039251)
+  * Drop the restart from postinst, as dh_installinit and dh_installsystemd
+    each add one and it would otherwise run twice under systemd
+  * The init script stays installed for sysvinit users
+
+ -- Nadzeya Hutsko <[email protected]>  Fri, 25 Sep 2026 18:53:41 +0200
+
 linuxlogo (6.01-0.2) unstable; urgency=medium
 
   * NMU: Non-Maintainer Upload
diff -Nru linuxlogo-6.01/debian/linuxlogo.init linuxlogo-6.01/debian/linuxlogo.init
--- linuxlogo-6.01/debian/linuxlogo.init	2026-05-18 18:42:20.000000000 +0200
+++ linuxlogo-6.01/debian/linuxlogo.init	2026-09-25 18:34:54.000000000 +0200
@@ -28,16 +28,7 @@
 	start|restart|reload|force-reload)
 		log_action_begin_msg "Updating the ${DESC}"
 
-		mkdir -p /var/run/linuxlogo
-
-		"${DAEMON}" -t "Debian Version $(cat /etc/debian_version)" -f    | sed -e 's/\\/\\\\/g' > /etc/issue.linuxlogo
-		"${DAEMON}" -t "Debian Version $(cat /etc/debian_version)" -a -f | sed -e 's/\\/\\\\/g' > /etc/issue.linuxlogo.ascii
-
-		for FILE in /etc/issue.linuxlogo /etc/issue.linuxlogo.ascii
-		do
-			printf "\n\n" >> "${FILE}"
-			cat /etc/issue >> "${FILE}"
-		done
+		/usr/libexec/linuxlogo-update-issue
 
 		log_action_end_msg 0
 		;;
diff -Nru linuxlogo-6.01/debian/linuxlogo.install linuxlogo-6.01/debian/linuxlogo.install
--- linuxlogo-6.01/debian/linuxlogo.install	2026-05-18 18:42:20.000000000 +0200
+++ linuxlogo-6.01/debian/linuxlogo.install	2026-09-25 18:34:51.000000000 +0200
@@ -1,3 +1,4 @@
 debian/local/linux_logo.conf	/etc
 debian/pixmaps/*		/usr/share/pixmaps
 debian/install_linux_logo /usr/share/linuxlogo
+debian/linuxlogo-update-issue	/usr/libexec
diff -Nru linuxlogo-6.01/debian/linuxlogo.postinst linuxlogo-6.01/debian/linuxlogo.postinst
--- linuxlogo-6.01/debian/linuxlogo.postinst	2026-05-18 18:42:20.000000000 +0200
+++ linuxlogo-6.01/debian/linuxlogo.postinst	2026-09-25 18:37:40.000000000 +0200
@@ -18,14 +18,9 @@
 
 case "${1}" in
 	configure)
+		# The restart that used to be here is now left to the snippets
+		# below, one per init system, so it no longer runs twice
 		rm -f /usr/bin/linux_logo_wait
-
-		if [ -x "$(which invoke-rc.d)" ]
-		then
-			invoke-rc.d linuxlogo restart || exit ${?}
-		else
-			/etc/init.d/linuxlogo restart || exit ${?}
-		fi
 		;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)
diff -Nru linuxlogo-6.01/debian/linuxlogo.service linuxlogo-6.01/debian/linuxlogo.service
--- linuxlogo-6.01/debian/linuxlogo.service	1970-01-01 01:00:00.000000000 +0100
+++ linuxlogo-6.01/debian/linuxlogo.service	2026-09-25 18:33:56.000000000 +0200
@@ -0,0 +1,15 @@
+[Unit]
+Description=Color ANSI system logo for the login prompt
+Documentation=man:linux_logo(1)
+After=local-fs.target remote-fs.target
+Wants=getty-pre.target
+Before=getty-pre.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/libexec/linuxlogo-update-issue
+ExecReload=/usr/libexec/linuxlogo-update-issue
+
+[Install]
+WantedBy=multi-user.target
diff -Nru linuxlogo-6.01/debian/linuxlogo-update-issue linuxlogo-6.01/debian/linuxlogo-update-issue
--- linuxlogo-6.01/debian/linuxlogo-update-issue	1970-01-01 01:00:00.000000000 +0100
+++ linuxlogo-6.01/debian/linuxlogo-update-issue	2026-09-25 18:33:49.000000000 +0200
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Regenerates /etc/issue.linuxlogo and its ascii variant, for
+# linuxlogo.service and /etc/init.d/linuxlogo. Both files live under
+# /run, so they have to be written again on every boot
+#
+# ExecStart cannot do it alone, as the logo is piped through sed and
+# /etc/issue is appended
+
+set -e
+
+DAEMON="/usr/bin/linux_logo"
+
+test -x "${DAEMON}" || exit 0
+
+mkdir -p /run/linuxlogo
+
+TITLE="Debian Version $(cat /etc/debian_version)"
+
+"${DAEMON}" -t "${TITLE}" -f    | sed -e 's/\\/\\\\/g' > /etc/issue.linuxlogo
+"${DAEMON}" -t "${TITLE}" -a -f | sed -e 's/\\/\\\\/g' > /etc/issue.linuxlogo.ascii
+
+for FILE in /etc/issue.linuxlogo /etc/issue.linuxlogo.ascii
+do
+	printf "\n\n" >> "${FILE}"
+	cat /etc/issue >> "${FILE}"
+done

Reply via email to