[pmg-devel] [PATCH pmg-api] fix #3915: remove obsolete /etc/apt/apt.conf.d/75pmgconf

Stoiko Ivanov s.ivanov at proxmox.com
Tue Aug 30 10:30:11 CEST 2022


this was forgotten when introducing the more flexible kernel-keeping
logic with proxmox-boot-tool (in 6.4).

while this file is present no pve-kernel gets autoremoved.

using debian/conffiles (deb-conffiles(5)) logic for this following the
recommendation from (dpkg-maintscript-helper(1) - for dpkg > 1.20.6).

Tested the following with a VM:
* regular unchanged /etc/apt/apt.conf.d/75pmgconf
* manually modified /etc/apt/apt.conf.d/75pmgconf
* manually removed /etc/apt/apt.conf.d/75pmgconf

Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 debian/conffiles | 1 +
 src/Makefile     | 3 +--
 src/pmg-apt.conf | 7 -------
 3 files changed, 2 insertions(+), 9 deletions(-)
 create mode 100644 debian/conffiles
 delete mode 100644 src/pmg-apt.conf

diff --git a/debian/conffiles b/debian/conffiles
new file mode 100644
index 0000000..6e99ab6
--- /dev/null
+++ b/debian/conffiles
@@ -0,0 +1 @@
+remove-on-upgrade /etc/apt/apt.conf.d/75pmgconf
diff --git a/src/Makefile b/src/Makefile
index f08be0f..49c7974 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -164,7 +164,7 @@ LIBSOURCES =				\
 	PMG/API2/NodeConfig.pm		\
 	PMG/API2.pm			\
 
-SOURCES = ${LIBSOURCES} ${CLI_BINARIES} ${TEMPLATES_FILES} ${CONF_MANS} ${CLI_MANS} ${SERVICE_MANS} ${SERVICE_UNITS} ${TIMER_UNITS} pmg-sources.list pmg-apt.conf pmg-initramfs.conf
+SOURCES = ${LIBSOURCES} ${CLI_BINARIES} ${TEMPLATES_FILES} ${CONF_MANS} ${CLI_MANS} ${SERVICE_MANS} ${SERVICE_UNITS} ${TIMER_UNITS} pmg-sources.list pmg-initramfs.conf
 
 all: ${SOURCES}
 
@@ -189,7 +189,6 @@ install: ${SOURCES} $(addsuffix .service-bash-completion, ${SERVICES}) $(addsuff
 	install -d -m 0755 ${DOCDIR}
 	# TODO: is there a better location ?
 	install -m 0644 favicon.ico ${DOCDIR}
-	install -D -m 0644 pmg-apt.conf ${DESTDIR}/etc/apt/apt.conf.d/75pmgconf
 	install -D -m 0644 pmg-sources.list ${DESTDIR}/etc/apt/sources.list.d/pmg-enterprise.list
 	for i in ${LIBSOURCES}; do install -D -m 0644 $$i ${PERL5DIR}/$$i; done
 	for i in ${SERVICES}; do install -D -m 0644 PMG/Service/$$i.pm ${PERL5DIR}/PMG/Service/$$i.pm; done
diff --git a/src/pmg-apt.conf b/src/pmg-apt.conf
deleted file mode 100644
index 0391b74..0000000
--- a/src/pmg-apt.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-APT
-{
-  NeverAutoRemove
-  {
-	"^pve-kernel-.*";
-  };
-}
-- 
2.30.2





More information about the pmg-devel mailing list