Bug#1030303: install tmpfiles and sysusers config into correct path
Am 02.02.23 um 16:14 schrieb Philip Hands: Michael Biebl writes: I noticed that openqa and openqa-worker install its tmpfiles and sysusers configuration files into /lib. IIRC Originally the instalation into /lib was done in order to deal with the fact that dh_installsystem seemed not to notice them under /usr/lib. Btw, I'm specifically talking about sysusers and tmpfiles here. service units are still installed in /lib/systemd/system for historical reasons and for consistencies sake, openqa should continue shipping them there until we change that distro-wide. Regards, Michael OpenPGP_signature Description: OpenPGP digital signature
Bug#1030303: install tmpfiles and sysusers config into correct path
Hi Phil Am 02.02.23 um 16:14 schrieb Philip Hands: Michael Biebl writes: I noticed that openqa and openqa-worker install its tmpfiles and sysusers configuration files into /lib. IIRC Originally the instalation into /lib was done in order to deal with the fact that dh_installsystem seemed not to notice them under /usr/lib. I presumed that would get fixed at some point, and intended to revert to installing them into their upstream location once that's done. However, I was also under the impression that we were supposed to be refraining from moving files between /lib/ and /usr/lib until after usr-merge was sorted out, in order to avoid issues with dpkg, so wasn't planning on touching this until that is all settled, just in case the openqa packages need rearanging at some point (since moving files between packages is what provokes that problem) That's why I think it's actually good to fix this for bookworm: openqa is not in stable yet, so you don't have an upgrade issue here that you need to worry about (as far as stable updates are concerned). I'd be happy to be proven wrong on this, as that would allow me to discard the special case from the install file. A move between / and /usr/lib is only problematic if a you also move the files between packages. This is not the case here, so should be safe. Regards, Michael OpenPGP_signature Description: OpenPGP digital signature
Bug#1030303: install tmpfiles and sysusers config into correct path
Michael Biebl writes: > I noticed that openqa and openqa-worker install its tmpfiles and > sysusers configuration files into /lib. IIRC Originally the instalation into /lib was done in order to deal with the fact that dh_installsystem seemed not to notice them under /usr/lib. I presumed that would get fixed at some point, and intended to revert to installing them into their upstream location once that's done. However, I was also under the impression that we were supposed to be refraining from moving files between /lib/ and /usr/lib until after usr-merge was sorted out, in order to avoid issues with dpkg, so wasn't planning on touching this until that is all settled, just in case the openqa packages need rearanging at some point (since moving files between packages is what provokes that problem) I'd be happy to be proven wrong on this, as that would allow me to discard the special case from the install file. Cheers, Phil. -- |)| Philip Hands [+44 (0)20 8530 9560] HANDS.COM Ltd. |-| http://www.hands.com/http://ftp.uk.debian.org/ |(| Hugo-Klemm-Strasse 34, 21075 Hamburg,GERMANY signature.asc Description: PGP signature
Bug#1030303: install tmpfiles and sysusers config into correct path
Source: openqa Version: 4.6.1674490999.b00c12673-1 Severity: normal Tags: patch Hi, I noticed that openqa and openqa-worker install its tmpfiles and sysusers configuration files into /lib. The correct paths are in /usr/lib though as you can query from systemd.pc: $ pkg-config --variable=tmpfilesdir systemd /usr/lib/tmpfiles.d $ pkg-config --variable=sysusersdir systemd /usr/lib/sysusers.d The attached patch fixes the paths. Regards, Michael -- System Information: Debian Release: bookworm/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 6.1.0-3-amd64 (SMP w/4 CPU threads; PREEMPT) Kernel taint flags: TAINT_FIRMWARE_WORKAROUND Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled +++ openqa-4.6.1674490999.b00c12673/debian/changelog2023-02-02 11:23:38.0 +0100 @@ -1,3 +1,10 @@ +openqa (4.6.1674490999.b00c12673-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install tmpfiles and sysusers configuration into correct paths. + + -- Michael Biebl Thu, 02 Feb 2023 11:23:38 +0100 + openqa (4.6.1674490999.b00c12673-1) unstable; urgency=medium * Update to new upstream version 4.6.1674490999.b00c12673. diff -Nru openqa-4.6.1674490999.b00c12673/debian/openqa.install openqa-4.6.1674490999.b00c12673/debian/openqa.install --- openqa-4.6.1674490999.b00c12673/debian/openqa.install 2023-01-25 10:33:09.0 +0100 +++ openqa-4.6.1674490999.b00c12673/debian/openqa.install 2023-02-02 11:23:35.0 +0100 @@ -24,8 +24,8 @@ usr/lib/systemd/system/openqa-setup-db.service /lib/systemd/system/ usr/lib/systemd/system/openqa-reload-worker-auto-restart@.path /lib/systemd/system/ usr/lib/systemd/system/openqa-reload-worker-auto-restart@.service /lib/systemd/system/ -debian/tmp/usr/lib/sysusers.d/geekotest.conf /lib/sysusers.d/ -usr/lib/tmpfiles.d/openqa-webui.conf /lib/tmpfiles.d/ +usr/lib/sysusers.d/geekotest.conf +usr/lib/tmpfiles.d/openqa-webui.conf usr/share/openqa/lib/DBIx/ usr/share/openqa/lib/OpenQA/LiveHandler.pm usr/share/openqa/lib/OpenQA/Resource/ diff -Nru openqa-4.6.1674490999.b00c12673/debian/openqa-worker.install openqa-4.6.1674490999.b00c12673/debian/openqa-worker.install --- openqa-4.6.1674490999.b00c12673/debian/openqa-worker.install 2023-01-25 10:33:09.0 +0100 +++ openqa-4.6.1674490999.b00c12673/debian/openqa-worker.install 2023-02-02 11:23:38.0 +0100 @@ -11,8 +11,8 @@ usr/lib/systemd/system/openqa-worker-no-cleanup@.service /lib/systemd/system/ usr/lib/systemd/system/openqa-slirpvde.service /lib/systemd/system/ usr/lib/systemd/system/openqa-vde_switch.service /lib/systemd/system/ -debian/tmp/usr/lib/sysusers.d/openQA-worker.conf /lib/sysusers.d/ -usr/lib/tmpfiles.d/openqa.conf /lib/tmpfiles.d/ +usr/lib/sysusers.d/openQA-worker.conf +usr/lib/tmpfiles.d/openqa.conf usr/share/openqa/lib/OpenQA/CacheService usr/share/openqa/lib/OpenQA/Worker usr/share/openqa/script/openqa-slirpvde
