From: Ian Jackson Date: Wed, 27 Feb 2019 16:37:32 +0000 (+0000) Subject: /etc/default/xen: Handle with ucf X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ae40dca3211ec35ca235a8a1f34c37e13093ff0d;p=people%2Fiwj%2Fxen.git /etc/default/xen: Handle with ucf We reintroduced this file in "d/xen-utils-common.install: ship /etc/default/xen" eg 2f34db35dd27abb4280d38ebc4464c21f64df8c9 But I had forgotten that this file was previously shipped and handled by ucf; and we have machinery to try to remove it. This leaves the following possible cases: (a) stretch: file handled by ucf (b) older buster: file not shipped, ucf postinst action not done | file remains recorded by ucf and ucfr, but that the original | version of the file is no longer present on the user's machine (c) newer buster: file shipped, file recorded by ucf with one old version and as dpkg conffile by newer version (a) and (b) will be handled correctly by just using ucf in the normal way. (c) xxx needs testing So: * Drop the special call to ucf-remove-fixup; retain the call to ucf * Switch to shipping the file in /usr/share as expected by ucf We do not remove the file's entry from not-installed - see the comment relating to #831786. Signed-off-by: Ian Jackson --- diff --git a/debian/rules b/debian/rules index 4d3ff89219..23c982eb41 100755 --- a/debian/rules +++ b/debian/rules @@ -320,4 +320,3 @@ override_dh_missing: # earlier versions. See ./ucf-remove-fixup for more details. override_dh_ucf: dh_ucf - debian/ucf-remove-fixup xen-utils-common /etc/default/xen diff --git a/debian/xen-utils-common.install b/debian/xen-utils-common.install index 58aad0a9fa..7c318a19dd 100755 --- a/debian/xen-utils-common.install +++ b/debian/xen-utils-common.install @@ -8,7 +8,7 @@ etc/xen/xl* etc/bash_completion.d/xl.sh => usr/share/bash-completion/completions/xl etc/default/xendomains -etc/default/xencommons => /etc/default/xen +etc/default/xencommons => usr/share/xen-utils-common/default.xen etc/xen/oxenstored.conf usr/bin