[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 7 commits: changelog: Create entry for 9.7.0-1
Andrea Bolognani (@abologna)
gitlab at salsa.debian.org
Wed Sep 13 21:31:34 BST 2023
Andrea Bolognani pushed to branch debian/latest at Libvirt Packaging Team / libvirt
Commits:
3fddac48 by Andrea Bolognani at 2023-09-01T20:04:19+02:00
changelog: Create entry for 9.7.0-1
Gbp-Dch: Ignore
- - - - -
04a73be4 by Andrea Bolognani at 2023-09-01T20:05:50+02:00
symbols: Bump symbol versions
New symbols:
* virNetworkGetMetadata
* virNetworkSetMetadata
Gbp-Dch: Ignore
- - - - -
c25e497a by Andrea Bolognani at 2023-09-01T20:22:38+02:00
patches: Drop backports
- - - - -
c421e715 by Andrea Bolognani at 2023-09-01T20:24:58+02:00
patches: Refresh patches
Gbp-Dch: Ignore
- - - - -
fa6ecf65 by Andrea Bolognani at 2023-09-11T22:22:28+02:00
dirs: Don't ship channels directory
Starting with libvirt 9.7.0, channels are created under
/run/libvirt instead of /var/lib/libvirt, so we no longer need
to ship any directory as part of the package.
The migration between the two locations happens seamlessly:
domains that are running when the upgrade is performed keep
using the old directory, while domains that are started
afterwards use the new one.
As a result of that, if there are any running domains during
the upgrade, dpkg will refuse to delete the old directories.
Add a postint snippet that will take care of cleaning up
during a future upgrade, once all domains have been restarted
and are thus using the new location.
- - - - -
c0d6b5fb by Andrea Bolognani at 2023-09-13T21:27:43+02:00
postrm: Clean up channels on purge
Channels are runtime data that gets created on domain startup
and deleted on domain shutdown. When we're purging the package,
there's no need to keep them around.
To account for the unlikely scenario in which the user might
have stored valuable data in the directory, we don't force
removal of the directory and instead only delete it if it's
empty once the libvirt-owned files have been removed.
Gbp-Dch: Ignore
- - - - -
2e4e3511 by Andrea Bolognani at 2023-09-13T21:48:26+02:00
Document changes and release 9.7.0-1
- - - - -
10 changed files:
- debian/changelog
- debian/libvirt-daemon-system.dirs
- debian/libvirt-daemon-system.postinst
- debian/libvirt-daemon-system.postrm
- debian/libvirt0.symbols
- − debian/patches/backport/src-fix-max-file-limits-in-systemd-services.patch
- debian/patches/debian/Debianize-libvirt-guests.patch
- debian/patches/forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
- debian/patches/forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+libvirt (9.7.0-1) unstable; urgency=medium
+
+ * [4864e4d] New upstream version 9.7.0
+ * [c25e497] patches: Drop backports
+ * [fa6ecf6] dirs: Don't ship channels directory
+ - The sockets used to implement channels for QEMU domains are
+ ephemeral runtime data, and are now correctly created
+ under /run/libvirt instead of /var/lib/libvirt
+
+ -- Andrea Bolognani <eof at kiyuko.org> Wed, 13 Sep 2023 21:47:40 +0200
+
libvirt (9.6.0-3) experimental; urgency=medium
* [e380ddb] rules: Fix handling of ARCHES_{QEMU,LXC}
=====================================
debian/libvirt-daemon-system.dirs
=====================================
@@ -8,7 +8,6 @@ var/cache/libvirt/qemu
var/lib/libvirt/boot
var/lib/libvirt/images
var/lib/libvirt/qemu
-var/lib/libvirt/qemu/channel/target
var/lib/libvirt/sanlock
var/log/libvirt/lxc
var/log/libvirt/qemu
=====================================
debian/libvirt-daemon-system.postinst
=====================================
@@ -74,8 +74,6 @@ add_statoverrides()
QEMU_DIRS="
/var/lib/libvirt/qemu/
- /var/lib/libvirt/qemu/channel/
- /var/lib/libvirt/qemu/channel/target/
"
SANLOCK_DIR="/var/lib/libvirt/sanlock"
@@ -124,6 +122,14 @@ case "$1" in
rmdir --ignore-fail-on-non-empty /var/log/libvirt/uml
fi
+ # Directories used for channels until 9.7.0-1
+ if [ -d /var/lib/libvirt/qemu/channel/target ]; then
+ rmdir --ignore-fail-on-non-empty /var/lib/libvirt/qemu/channel/target
+ fi
+ if [ -d /var/lib/libvirt/qemu/channel ]; then
+ rmdir --ignore-fail-on-non-empty /var/lib/libvirt/qemu/channel
+ fi
+
# Force refresh of capabilities (#731815)
rm -f /var/cache/libvirt/qemu/capabilities/*.xml
=====================================
debian/libvirt-daemon-system.postrm
=====================================
@@ -85,6 +85,15 @@ case "$1" in
rm -rf /var/log/libvirt \
/var/cache/libvirt/qemu/capabilities
+ # Clean up obsolete runtime data
+ rm -rf /var/lib/libvirt/qemu/channel/target/domain-*
+ if [ -d /var/lib/libvirt/qemu/channel/target ]; then
+ rmdir --ignore-fail-on-non-empty /var/lib/libvirt/qemu/channel/target
+ fi
+ if [ -d /var/lib/libvirt/qemu/channel ]; then
+ rmdir --ignore-fail-on-non-empty /var/lib/libvirt/qemu/channel
+ fi
+
# Clean up created dirs if existent and empty, they contain precious
# data otherwise
for dir in /var/lib/libvirt/qemu/save \
@@ -94,7 +103,6 @@ case "$1" in
/var/lib/libvirt/qemu/ram/libvirt/qemu \
/var/lib/libvirt/qemu/ram/libvirt \
/var/lib/libvirt/qemu/ram \
- /var/lib/libvirt/qemu/channel \
/var/lib/libvirt/qemu \
/var/cache/libvirt/qemu; do
[ ! -d $dir ] || rmdir --ignore-fail-on-non-empty $dir
=====================================
debian/libvirt0.symbols
=====================================
@@ -98,7 +98,8 @@ libvirt.so.0 libvirt0 #MINVER#
*@LIBVIRT_8.4.0 8.4.0
*@LIBVIRT_8.5.0 8.5.0
*@LIBVIRT_9.0.0 9.0.0
- *@LIBVIRT_PRIVATE_9.6.0 9.6.0
+ *@LIBVIRT_9.7.0 9.7.0
+ *@LIBVIRT_PRIVATE_9.7.0 9.7.0
libvirt-qemu.so.0 libvirt0 #MINVER#
*@LIBVIRT_QEMU_0.8.3 0.8.3
@@ -116,4 +117,4 @@ libvirt-admin.so.0 libvirt0 #MINVER#
*@LIBVIRT_ADMIN_2.0.0 2.0.0~rc1
*@LIBVIRT_ADMIN_3.0.0 3.0.0
*@LIBVIRT_ADMIN_8.6.0 8.9.0
- *@LIBVIRT_ADMIN_PRIVATE_9.6.0 9.6.0
+ *@LIBVIRT_ADMIN_PRIVATE_9.7.0 9.7.0
=====================================
debian/patches/backport/src-fix-max-file-limits-in-systemd-services.patch deleted
=====================================
@@ -1,122 +0,0 @@
-From: =?utf-8?b?IkRhbmllbCBQLiBCZXJyYW5nw6ki?= <berrange at redhat.com>
-Date: Wed, 2 Aug 2023 10:00:22 +0100
-Subject: src: fix max file limits in systemd services
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-This fixes
-
- commit 38abf9c34dc481b0dc923bdab446ee623bdc5ab6
- Author: Daniel P. Berrangé <berrange at redhat.com>
- Date: Wed Jun 21 13:22:40 2023 +0100
-
- src: set max open file limit to match systemd >= 240 defaults
-
-The bug referenced in that commit had suggested to set
-
- LimitNOFile=512000:1024
-
-on the basis that matches current systemd default behaviour and is
-compatible with old systemd. That was good except
-
- * The setting is LimitNOFILE and these are case sensitive
- * The hard and soft limits were inverted - soft must come
- first and so it would have been ignored even if the
- setting name was correct.
- * The default hard limit is 524288 not 512000
-
-Reported-by: Olaf Hering <olaf at aepfle.de>
-Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
-(cherry picked from commit 3d2f3fb72b4c1d636822606ef8b1df29ae4a2be6)
-
-Forwarded: not-needed
-Origin: https://gitlab.com/libvirt/libvirt/-/commit/3d2f3fb72b4c1d636822606ef8b1df29ae4a2be6
----
- src/ch/virtchd.service.in | 2 +-
- src/locking/virtlockd.service.in | 2 +-
- src/logging/virtlogd.service.in | 2 +-
- src/lxc/virtlxcd.service.in | 2 +-
- src/qemu/virtqemud.service.in | 2 +-
- src/remote/libvirtd.service.in | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/ch/virtchd.service.in b/src/ch/virtchd.service.in
-index be242fe..351eee3 100644
---- a/src/ch/virtchd.service.in
-+++ b/src/ch/virtchd.service.in
-@@ -24,7 +24,7 @@ Restart=on-failure
- # Raise hard limits to match behaviour of systemd >= 240.
- # During startup, daemon will set soft limit to match hard limit
- # per systemd recommendations
--LimitNOFile=512000:1024
-+LimitNOFILE=1024:524288
- # The cgroups pids controller can limit the number of tasks started by
- # the daemon, which can limit the number of domains for some hypervisors.
- # A conservative default of 8 tasks per guest results in a TasksMax of
-diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
-index f1792dc..dd0bbab 100644
---- a/src/locking/virtlockd.service.in
-+++ b/src/locking/virtlockd.service.in
-@@ -18,7 +18,7 @@ OOMScoreAdjust=-900
- # Raise hard limits to match behaviour of systemd >= 240.
- # During startup, daemon will set soft limit to match hard limit
- # per systemd recommendations
--LimitNOFile=512000:1024
-+LimitNOFILE=1024:524288
-
- [Install]
- Also=virtlockd.socket
-diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
-index cef4053..8e245dd 100644
---- a/src/logging/virtlogd.service.in
-+++ b/src/logging/virtlogd.service.in
-@@ -18,7 +18,7 @@ OOMScoreAdjust=-900
- # Raise hard limits to match behaviour of systemd >= 240.
- # During startup, daemon will set soft limit to match hard limit
- # per systemd recommendations
--LimitNOFile=512000:1024
-+LimitNOFILE=1024:524288
-
- [Install]
- Also=virtlogd.socket
-diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in
-index b615a3f..ee3a7f1 100644
---- a/src/lxc/virtlxcd.service.in
-+++ b/src/lxc/virtlxcd.service.in
-@@ -24,7 +24,7 @@ Restart=on-failure
- # Raise hard limits to match behaviour of systemd >= 240.
- # During startup, daemon will set soft limit to match hard limit
- # per systemd recommendations
--LimitNOFile=512000:1024
-+LimitNOFILE=1024:524288
- # The cgroups pids controller can limit the number of tasks started by
- # the daemon, which can limit the number of domains for some hypervisors.
- # A conservative default of 8 tasks per guest results in a TasksMax of
-diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
-index e3dc738..e79670c 100644
---- a/src/qemu/virtqemud.service.in
-+++ b/src/qemu/virtqemud.service.in
-@@ -26,7 +26,7 @@ Restart=on-failure
- # Raise hard limits to match behaviour of systemd >= 240.
- # During startup, daemon will set soft limit to match hard limit
- # per systemd recommendations
--LimitNOFile=512000:1024
-+LimitNOFILE=1024:524288
- # The cgroups pids controller can limit the number of tasks started by
- # the daemon, which can limit the number of domains for some hypervisors.
- # A conservative default of 8 tasks per guest results in a TasksMax of
-diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
-index abac58c..84f1613 100644
---- a/src/remote/libvirtd.service.in
-+++ b/src/remote/libvirtd.service.in
-@@ -31,7 +31,7 @@ Restart=on-failure
- # Raise hard limits to match behaviour of systemd >= 240.
- # During startup, daemon will set soft limit to match hard limit
- # per systemd recommendations
--LimitNOFile=512000:1024
-+LimitNOFILE=1024:524288
- # The cgroups pids controller can limit the number of tasks started by
- # the daemon, which can limit the number of domains for some hypervisors.
- # A conservative default of 8 tasks per guest results in a TasksMax of
=====================================
debian/patches/debian/Debianize-libvirt-guests.patch
=====================================
@@ -31,12 +31,12 @@ index f27eaad..62b279c 100644
Action taken on host shutdown
diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
-index 0160142..0141f05 100644
+index 344b543..9ea221c 100644
--- a/tools/libvirt-guests.sh.in
+++ b/tools/libvirt-guests.sh.in
-@@ -21,19 +21,19 @@ localstatedir="@localstatedir@"
+@@ -20,19 +20,19 @@ sysconfdir="@sysconfdir@"
+ localstatedir="@localstatedir@"
initconfdir="@initconfdir@"
- libvirtd="@sbindir@"/libvirtd
-# Source function library.
-test ! -r "$sysconfdir"/rc.d/init.d/functions ||
@@ -60,7 +60,7 @@ index 0160142..0141f05 100644
SHUTDOWN_TIMEOUT=300
PARALLEL_SHUTDOWN=0
START_DELAY=0
-@@ -44,7 +44,7 @@ test -f "$initconfdir"/libvirt-guests &&
+@@ -43,7 +43,7 @@ test -f "$initconfdir"/libvirt-guests &&
. "$initconfdir"/libvirt-guests
LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
@@ -69,7 +69,7 @@ index 0160142..0141f05 100644
RETVAL=0
-@@ -563,8 +563,7 @@ gueststatus() {
+@@ -562,8 +562,7 @@ gueststatus() {
# rh_status
# Display current status: whether saved state exists, and whether start
=====================================
debian/patches/forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
=====================================
@@ -13,10 +13,10 @@ require the 'TERM' environment variable to be set to the terminal type.
1 file changed, 2 insertions(+)
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 910fb8d..b17ed01 100644
+index b58f7a6..5fad38b 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
-@@ -855,6 +855,8 @@ int virNetSocketNewConnectSSH(const char *nodename,
+@@ -840,6 +840,8 @@ int virNetSocketNewConnectSSH(const char *nodename,
virCommandAddEnvPass(cmd, "KRB5CCNAME");
virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK");
virCommandAddEnvPass(cmd, "SSH_ASKPASS");
=====================================
debian/patches/forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
=====================================
@@ -10,7 +10,7 @@ Closes: #663931
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 40ca205..37c0ce6 100644
+index b5b65fb..393b883 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -1246,7 +1246,7 @@ void virWaitForDevices(void)
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
-backport/src-fix-max-file-limits-in-systemd-services.patch
forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
debian/Debianize-libvirt-guests.patch
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/6316add4374489fbda29c1609bd077d64f5bea59...2e4e35118b755726f8d0d6c28dc29699c7905704
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/6316add4374489fbda29c1609bd077d64f5bea59...2e4e35118b755726f8d0d6c28dc29699c7905704
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20230913/bad1f904/attachment-0001.htm>
More information about the Pkg-libvirt-commits
mailing list