Your message dated Thu, 15 Oct 2020 23:08:37 +0000
with message-id <[email protected]>
and subject line Bug#971282: fixed in systemd 246.6-2
has caused the Debian Bug report #971282,
regarding ABI breakage: paths changed for 
sysusers.d/sysctl.d/binfmt/modules-load.d
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.)


-- 
971282: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971282
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: systemd
Version: 246.6-1
Severity: important

Upstream changed the paths in systemd.pc from prefix to rootprefix in
v246 for sysusers_dir, sysctl_dir, binfmt_dir and modules-load_dir:
https://github.com/systemd/systemd/commit/4a56315a990b802860170ecd1bbd3eb68e14a38b

This breaks packages which use pkg-config to determine those paths and
where .install files reference /usr/. An example is mandos.

I think we should revert this change. I don't see a compelling reason to
move those files from /usr to /lib given that we require /usr to be
pre-mounted by initramfs, if it's separate.
Moving files from /usr to /lib files kinda backwards nowadays.

I intend to apply a patch like the attached one in Debian.
That said, I hope I can convince Lennart to revert this change upstream
as well.

Thoughts, Comments?

Michael
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
index 3af9f99830..699a9748f2 100644
--- a/src/core/systemd.pc.in
+++ b/src/core/systemd.pc.in
@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir}
 tmpfiles_dir=/usr/lib/tmpfiles.d
 tmpfilesdir=${tmpfiles_dir}
 
-sysusers_dir=${rootprefix}/lib/sysusers.d
+sysusers_dir=${prefix}/lib/sysusers.d
 sysusersdir=${sysusers_dir}
 
-sysctl_dir=${rootprefix}/lib/sysctl.d
+sysctl_dir=${prefix}/lib/sysctl.d
 sysctldir=${sysctl_dir}
 
-binfmt_dir=${rootprefix}/lib/binfmt.d
+binfmt_dir=${prefix}/lib/binfmt.d
 binfmtdir=${binfmt_dir}
 
-modules_load_dir=${rootprefix}/lib/modules-load.d
+modules_load_dir=${prefix}/lib/modules-load.d
 modulesloaddir=${modules_load_dir}
 
 catalog_dir=/usr/lib/systemd/catalog
diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index 26d2341c2b..414e249884 100644
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -369,19 +369,19 @@ static int get_path(uint64_t type, char **buffer, const 
char **ret) {
                 return 0;
 
         case SD_PATH_SYSUSERS:
-                *ret = ROOTPREFIX_NOSLASH "/lib/sysusers.d";
+                *ret = "/usr/lib/sysusers.d";
                 return 0;
 
         case SD_PATH_SYSCTL:
-                *ret = ROOTPREFIX_NOSLASH "/lib/sysctl.d";
+                *ret = "/usr/lib/sysctl.d";
                 return 0;
 
         case SD_PATH_BINFMT:
-                *ret = ROOTPREFIX_NOSLASH "/lib/binfmt.d";
+                *ret = "/usr/lib/binfmt.d";
                 return 0;
 
         case SD_PATH_MODULES_LOAD:
-                *ret = ROOTPREFIX_NOSLASH "/lib/modules-load.d";
+                *ret = "/usr/lib/modules-load.d";
                 return 0;
 
         case SD_PATH_CATALOG:

--- End Message ---
--- Begin Message ---
Source: systemd
Source-Version: 246.6-2
Done: Michael Biebl <[email protected]>

We believe that the bug you reported is fixed in the latest version of
systemd, 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 systemd 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: Thu, 15 Oct 2020 23:48:34 +0200
Source: systemd
Architecture: source
Version: 246.6-2
Distribution: unstable
Urgency: medium
Maintainer: Debian systemd Maintainers 
<[email protected]>
Changed-By: Michael Biebl <[email protected]>
Closes: 968116 969144 970534 971282
Changes:
 systemd (246.6-2) unstable; urgency=medium
 .
   * XDG autostart improvements
     - Add support for Path= in XDG Desktop File
     - Ignore more common XDG Desktop Entry fields
     - Lower most info messages to debug level (Closes: #968116)
   * Re-enable seccomp support on riscv64.
     This should be safe now, as the code has fallbacks for systems with
     older libseccomp versions.
   * Move sysusers.d/sysctl.d/binfmt.d/modules-load.d back to /usr.
     In Debian, late mounting of /usr is no longer supported, so it is safe
     to install those files in /usr.
     We want those facilities in /usr, not /, as this will make an eventual
     switch to a merged-usr setup easier. (Closes: #971282)
   * units: update [email protected] to support 57600 baud rate
     (Closes: #969144)
   * bootspec: don't fail with EIO if searching for ESP and finding one without
     an enveloping partition table
     (Closes: #970534)
Checksums-Sha1:
 f25abb4da85e179f0f22df02de7ac900ffb191fb 5149 systemd_246.6-2.dsc
 3d05c1e5292ee3f9499d30a0e392d6cf19ef9425 157024 systemd_246.6-2.debian.tar.xz
 c137ea08bdaa38eec900e429d790a892c7c539cc 9465 systemd_246.6-2_source.buildinfo
Checksums-Sha256:
 2e3093a9cd4ca63587d9d20ab0e4205e52de8fde20bf47138014dc85185595d1 5149 
systemd_246.6-2.dsc
 ad154d24511ec25d54e480a56026f6017c092e20a2c36d27ac57c41a9dc12df6 157024 
systemd_246.6-2.debian.tar.xz
 ad4954f008c6e0953ad1274472c09ca054fd7ee9fb935da2897824ae536bf799 9465 
systemd_246.6-2_source.buildinfo
Files:
 6e9d33d093e3b477c8aa06b796f7a3cc 5149 admin optional systemd_246.6-2.dsc
 412b24243699378beef614cd293dc873 157024 admin optional 
systemd_246.6-2.debian.tar.xz
 2fab4bfbd0e329e271f0425e2ca47a08 9465 admin optional 
systemd_246.6-2_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEECbOsLssWnJBDRcxUauHfDWCPItwFAl+I0fQACgkQauHfDWCP
ItzA7g/+Op/0zm5hhMjPcU82raC9ZvR1hFny7i9nHgD7sH95cksawQaTV/1V/MRu
eIleImO13SVnD8WtzqA+SDZZW3gbwuyC8wMqOf2CffQkO0MFg06B8iUf4B0/gpvN
m27BXX3rZChq+ikeEoK6PqFH3bLvX14992x6/XKPbT3utVfQdpg8QL2RFXk2sIy9
Scgcfx09YNhd6lYK79XaIcyFxgUEHUDlXfRxjwaNN4TK4toome0jZkhLJcMnV/kj
eNqR5c/PB/cv1kSQaupyBLpPCE1oaeo0fPAV7VnU8sK4UfIZ5FINXeSPwudt7UX/
Qe2Fc8EKzu/yjKu58whsuHobhkCz7RRPy/CKl1Lh5TpMz6PyN5yKl3HfX0/9+8mI
dL6tSxPzczBJdFSCq7/sRGGcw1Ny1i9sFSI0sMfPWQz+yCg/fBLkNdqbAT0ke5HW
Kp9KhzMgfhtmAfB4LfrDHmSNdUAR+QVoJprGNI0w5LgA3X2Nreobdis6HN7rMGXt
VSvBBgoF9tpNVRK1sLu3wW/ss8AcEMU4A7jGiXjP9bNeCVah3hmL3JxaenKuSFMg
NpjZFGJaI/ejtxc7FYC0PICaWtMrNhERYgIxEnCAF+rMGFpty/29Oki21HDGlPbT
K7hhqgl0642opMuzuAIHmjoFe4W+lrmZP1LKGgr2icaZFBBH+Kg=
=mOEm
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to