[pve-devel] [PATCH package-rebuilds] rrdtool: d/patches: replace /var/run with /run to avoid systemd warning

[Fiona Ebner <f.ebner@proxmox.com>]

While it is not guaranteed that '/var/run' is a symlink to '/run'
according to Debian policy [0], systemd will automatically replace
'/var/run' with '/run' [1] for the 'ListenStream=' option (and others)
and produce a warning:

> systemd[1]: /usr/lib/systemd/system/rrdcached.socket:11: ListenStream=
> references a path below legacy directory /var/run/, updating
> /var/run/rrdcached.sock → /run/rrdcached.sock; please update the unit
> file accordingly.

Update the unit file to avoid the warning. No functional change
intended. Reported in the community forum [2].

[0]: https://lore.proxmox.com/pve-devel/58410023-8845-4c39-a974-8f796cab10dd@proxmox.com/
[1]: patch_var_run() function in src/core/load-fragment.c
[2]: https://forum.proxmox.com/threads/175582/

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

I had a difficult time building the package. But the very same
failures occured even without my changes. When using sbuild I got:

FAIL: list1
===========

/build/reproducible-path/rrdtool-1.7.2/src/rrdtool create /build/reproducible-path/rrdtool-1.7.2/tests/list1.rrd --start 1300000000 --step 60s DS:dv:DDERIVE:300:U:U DS:wh:DCOUNTER:300:0:U RRA:AVERAGE:0.5:1:600 RRA:AVERAGE:0.5:10:144
OK: create
/build/reproducible-path/rrdtool-1.7.2/src/rrdtool list
OK: list without parameters displays Usage
OK: empty directory /build/reproducible-path/rrdtool-1.7.2/tests/list1_dir returns nothing
/build/reproducible-path/rrdtool-1.7.2/src/rrdtool list /build/reproducible-path/rrdtool-1.7.2/tests/list1.rrd
OK: single file /build/reproducible-path/rrdtool-1.7.2/tests/list1.rrd 
/build/reproducible-path/rrdtool-1.7.2/src/rrdtool list /build/reproducible-path/rrdtool-1.7.2/tests/list1_dir
OK: directory with several RRDs
/build/reproducible-path/rrdtool-1.7.2/src/rrdtool list /build/reproducible-path/rrdtool-1.7.2/tests/list1_dir
OK: only lists files with .rrd suffix
/build/reproducible-path/rrdtool-1.7.2/src/rrdtool list /build/reproducible-path/rrdtool-1.7.2/tests/list1_dir
OK: only lists RRDs and directories
/build/reproducible-path/rrdtool-1.7.2/src/rrdtool list --recursive /build/reproducible-path/rrdtool-1.7.2/tests/list1_dir
OK: recursive list only lists rrd files

Starting rrdcached...
OK: empty directory ./list1_dir returns nothing
/build/reproducible-path/rrdtool-1.7.2/src/rrdtool list /list1.rrd
No such file or directoryERROR: Unable to connect to rrdcached: No such file or directory
FAILED: (rc=1) single file /list1.rrd 
cat: /build/reproducible-path/rrdtool-1.7.2/tests/list1-rrdcached.pid: No such file or directory
kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
FAIL list1 (exit status: 1)

and when building outside of sbuild I got:

FAIL: rpn2

with differing outputs for the test case. I did not find out what
exactly caused this. The same test case succeeded inside sbuild.

I had to exclude that test case and there also was a man page I needed
to exclude from dh_missing, since I got librados installed on my
system, namely usr/share/man/man1/rrdrados.1

 ...rrdcached.socket-unit-place-socket-to-previous-var-r.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/rrdtool/rrdtool-1.7.2/debian/patches/0001-rrdcached.socket-unit-place-socket-to-previous-var-r.patch b/pkgs/rrdtool/rrdtool-1.7.2/debian/patches/0001-rrdcached.socket-unit-place-socket-to-previous-var-r.patch
index c9d1e9d..169c378 100644
--- a/pkgs/rrdtool/rrdtool-1.7.2/debian/patches/0001-rrdcached.socket-unit-place-socket-to-previous-var-r.patch
+++ b/pkgs/rrdtool/rrdtool-1.7.2/debian/patches/0001-rrdcached.socket-unit-place-socket-to-previous-var-r.patch
@@ -15,6 +15,8 @@ previous path.
 
 Fixes: 7bf2117 ("rrdtools: replace rrdcached sysv init script with systemd units")
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+[FE: change /var/run to /run to avoid systemd warning]
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
  etc/rrdcached.socket.in  | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -28,7 +30,7 @@ index 7a2d63e..b613657 100644
  
  [Socket]
 -ListenStream=/tmp/rrdcached.sock
-+ListenStream=/var/run/rrdcached.sock
++ListenStream=/run/rrdcached.sock
  #ListenStream=[::1]:42217
  #DirectoryMode=0755
  #SocketMode=0666
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel