Your message dated Sun, 05 Jul 2020 10:18:48 +0000 with message-id <[email protected]> and subject line Bug#964159: fixed in init-system-helpers 1.58 has caused the Debian Bug report #964159, regarding /usr/bin/deb-systemd-helper: Makes packages using dh_installsystemduser(1) fail piuparts to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 964159: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=964159 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: init-system-helpers Version: 1.57 Severity: normal File: /usr/bin/deb-systemd-helper Tags: patch Dear Maintainer, dh_installsystemduser/13.1 adds the following snippets to postrm scripts: --8<---------------------------------------------------------------------->8-- # Automatically added by dh_installsystemduser/13.1 if [ "$1" = "remove" ]; then if [ -x "/usr/bin/deb-systemd-helper" ] ; then deb-systemd-helper --user mask 'NAME.service' >/dev/null || true fi fi if [ "$1" = "purge" ]; then if [ -x "/usr/bin/deb-systemd-helper" ] ; then deb-systemd-helper --user purge 'NAME.service' >/dev/null || true deb-systemd-helper --user unmask 'NAME.service' >/dev/null || true fi fi # End automatically added section --8<---------------------------------------------------------------------->8-- So `postrm remove` creates a symlink ‘/etc/systemd/user/NAME.service → /dev/null’ plus an empty file ‘/var/lib/systemd/deb-systemd-user-helper-masked/NAME.service’. `postrm purge` removes these but not the parents directories, hence causes `piuparts -d sid --no-upgrade-test` to fail with ERROR: FAIL: Package purging left files on system: /etc/systemd/user/ not owned /var/lib/systemd/deb-systemd-user-helper-masked/ not owned The attached patch fixes this. I mirrored what was done for /etc/systemd/system resp. /var/lib/systemd/deb-systemd-helper-masked, namely claiming ownership for /etc/systemd/user and removing /var/lib/systemd/deb-systemd-user-helper-masked if empty. -- System Information: Debian Release: bullseye/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 5.7.0-1-amd64 (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages init-system-helpers depends on: ii perl-base 5.30.3-4 init-system-helpers recommends no packages. init-system-helpers suggests no packages. Versions of packages init-system-helpers is related to: ii insserv 1.21.0-1 -- no debconf information -- Guilhem.From 1a380bde29ef719380f4b8011f0dba20df2fd142 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin <[email protected]> Date: Thu, 2 Jul 2020 20:26:13 +0200 Subject: Ensure dh_installsystemduser(1)-added snippets pass piuparts Claim ownership of /etc/systemd/user (like /etc/systemd/system) and make `deb-systemd-helper --user unmask` remove /var/lib/systemd/deb-systemd-user-helper-masked if empty (like `deb-systemd-helper unmask` does for /var/lib/systemd/deb-systemd-helper-masked). This fixes `piuparts -d sid --no-upgrade-test` failing with ERROR: FAIL: Package purging left files on system: /etc/systemd/user/ not owned /var/lib/systemd/deb-systemd-user-helper-masked/ not owned For packages shipping user units installed with dh_installsystemduser(1). Closes: #-1 --- debian/init-system-helpers.dirs | 1 + script/deb-systemd-helper | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/init-system-helpers.dirs b/debian/init-system-helpers.dirs index ecc30d6..4f65e8a 100644 --- a/debian/init-system-helpers.dirs +++ b/debian/init-system-helpers.dirs @@ -7,4 +7,5 @@ /etc/rc6.d /etc/rcS.d /etc/systemd/system +/etc/systemd/user /var/lib/systemd diff --git a/script/deb-systemd-helper b/script/deb-systemd-helper index 2400352..0b4d929 100755 --- a/script/deb-systemd-helper +++ b/script/deb-systemd-helper @@ -603,7 +603,8 @@ for my $scriptname (@ARGV) { unmask_service($scriptname, $service_path); # Clean up the state dir if it’s empty, or at least clean up all empty # subdirectories. Necessary to cleanly pass a piuparts run. - rmdir_if_empty('/var/lib/systemd/deb-systemd-helper-masked'); + rmdir_if_empty(SYSTEM_INSTANCE_MASKED_STATE_DIR); + rmdir_if_empty(USER_INSTANCE_MASKED_STATE_DIR); } } -- 2.27.0
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---Source: init-system-helpers Source-Version: 1.58 Done: Michael Biebl <[email protected]> We believe that the bug you reported is fixed in the latest version of init-system-helpers, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [email protected], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Michael Biebl <[email protected]> (supplier of updated init-system-helpers package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [email protected]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Sun, 05 Jul 2020 11:50:05 +0200 Source: init-system-helpers Architecture: source Version: 1.58 Distribution: unstable Urgency: medium Maintainer: Debian systemd Maintainers <[email protected]> Changed-By: Michael Biebl <[email protected]> Closes: 925995 964159 Changes: init-system-helpers (1.58) unstable; urgency=medium . [ Guilhem Moulin ] * Ensure dh_installsystemduser(1)-added snippets pass piuparts. Claim ownership of /etc/systemd/user (like /etc/systemd/system) and make `deb-systemd-helper --user unmask` remove /var/lib/systemd/deb-systemd-user-helper-masked if empty (like `deb-systemd-helper unmask` does for /var/lib/systemd/deb-systemd-helper-masked). For packages shipping user units installed with dh_installsystemduser(1). (Closes: #964159) . [ Michael Biebl ] * man: Fix typo in service(8) man page (Closes: #925995) * update-rc.d: Consider /usr/lib/systemd/system when searching for unit files Checksums-Sha1: ed338b18cbb29ee6da53b8fed1b72b89d2a9c86f 1896 init-system-helpers_1.58.dsc 631191d50c792bf1d63d93b7919a24716ab3e72e 40668 init-system-helpers_1.58.tar.xz fb755f78e4ad82f684bcffa3221c4e718b038168 5511 init-system-helpers_1.58_source.buildinfo Checksums-Sha256: d754ec5e07416c63ead4c8c029d24027c563ff5f83762f2ac5246f716d405784 1896 init-system-helpers_1.58.dsc 99f82ffca33b121f7aa31a06b6227f4684d986ff342a27b07433711de883609d 40668 init-system-helpers_1.58.tar.xz 91f9df9ccd7247086a72cfd1471ee7e43c8c3bc560aa383a4d7a6519cad53b24 5511 init-system-helpers_1.58_source.buildinfo Files: 65ca09631db13a72aa980f0424617998 1896 admin optional init-system-helpers_1.58.dsc 5b7abc618f45d2e6cb5ff9b5b7334b4e 40668 admin optional init-system-helpers_1.58.tar.xz 8016fd98cbb44cb98c06b7e8626b6b6c 5511 admin optional init-system-helpers_1.58_source.buildinfo -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEECbOsLssWnJBDRcxUauHfDWCPItwFAl8BpCcACgkQauHfDWCP Ityg3g//fBT/kAF3PXTe9ZEDVVJ0mhr1GGERPdW1YPkScSfaX3Iyx9hii/DrkBIb UdBFJcG19u1UWEiW8LH/a18bVsCbyjXru2SPX7Fr7NKrIl5SbL1G4nbAueofrKLZ Z0/h7SkZbzc12WTe3snc3WYKVJK45pFB5agrMYQFgdD76nL6pFF1MBpoERa7ibl0 hciwKZu/T/j67wDbRev+AEdSt/xb98lWieMPLmZRrHmbelah4kcN4xALkU0btbO0 WQylWahUG31CLCE0nj+3rnwFzHTLiixZ0vhVzequaMYvTVlitn+sVNXtkFlXRwzw e0sWhb2IajcYjzRhGg+P1t/ZYKU425/HVjaljIMdcE3LpO/7bzaCTTiOZ5sohhzF NbNckdehm2anr5ArofAdQE7+QDygRs5C4goLA8pWlTB2CeI9L9EDXqFSe+mDf0lv YVVNlH06Gil/9BI1skd5cI7ACawUhJZRSqDCc8pKnhSmDgn0oChBZ81zTwbpRebY mEtR5+4UeATNpzM+7G1/9ryM11kEq5DTdT3kBqPx0TzbSVUb8N4ySmVYNAG7aw47 8axnYELD2x+Ks1dgw27SLUsIqjyJvSa2xi2zXONYBn0JpJDZzBdbF958Hq7MdtTp QN1gkF/iIhr310oyAz2JppP6uJkE5YjIRond+tY2rmFr1AabZ08= =t2kX -----END PGP SIGNATURE-----
--- End Message ---
