Thank you for the well prepared SRU. I would kindly ask, though, that
you expand the test plan a bit.
You are currently only testing the TCP case, but your change affects all
choices:
- TCP or unix socket
- unix socket path
- tcp address and port
- socket mode and socket group
Could you please add to the test plan a verification that the new
generator correctly creates the socket override with these user
selections?
Incidentally, this is also something that could be automated as an
autopkgtest, if you are so inclined.
And a question: you are adding a systemctl daemon-reload call to clamav-
daemon.postinst just before #DEBHELPER#:
+# Reload systemd daemon to regenerate socket configuration
+# The systemd generator will read the updated clamd.conf
+if [ -d /run/systemd/system ]; then
+ systemctl daemon-reload || true
+fi
+
#DEBHELPER#
Is that really necessary? Because #DEBHELPER# expands into many bash
snippets, and one of them will also do a daemon-reload. Here is the
rendered file, on a system installed with a package built with your
proposed changes:
(...)
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
# Reload systemd daemon to regenerate socket configuration
# The systemd generator will read the updated clamd.conf
if [ -d /run/systemd/system ]; then
systemctl daemon-reload || true
fi
# Automatically added by dh_apparmor/5.0.0~alpha1-0ubuntu8.3
if [ "$1" = "configure" ]; then
(...)
# End automatically added section
# Automatically added by dh_installsystemd/13.24.2ubuntu1
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" =
"abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
if [ -d /run/systemd/system ]; then
systemctl --system daemon-reload >/dev/null || true
if [ -n "$2" ]; then
_dh_action=restart
else
_dh_action=start
fi
deb-systemd-invoke $_dh_action 'clamav-daemon.service'
'clamav-daemon.socket' >/dev/null || true
fi
fi
# End automatically added section
exit 0
The only difference is that:
a) it's conditioned on $1
b) it uses --system: systemctl --system daemon-reload
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/2129160
Title:
[FFe] [SRU] dpkg-reconfigure clamav-daemon does not respect TCP
configuration
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/clamav/+bug/2129160/+subscriptions
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
