public inbox for pmg-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api v2 1/2] fix #3915: remove obsolete /etc/apt/apt.conf.d/75pmgconf
Date: Wed, 31 Aug 2022 19:06:29 +0200	[thread overview]
Message-ID: <20220831170630.171069-2-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20220831170630.171069-1-s.ivanov@proxmox.com>

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

with this file present no pve-kernel gets autoremoved.

this patch uses d/maintscript for removing instead of using
debian/conffiles (deb-conffiles(5)) 'remove-on-upgrade'

sticking with d/maintscript was chosen, since else it depends on the
installed debhelper version if the removal is done at all (debhelper
from bullseye simply ignores remove-on-upgrade in d/conffiles)

Tested the following with a local version bump to 7.1-5 and 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@proxmox.com>
---
 debian/maintscript | 3 +++
 src/Makefile       | 3 +--
 src/pmg-apt.conf   | 7 -------
 3 files changed, 4 insertions(+), 9 deletions(-)
 create mode 100644 debian/maintscript
 delete mode 100644 src/pmg-apt.conf

diff --git a/debian/maintscript b/debian/maintscript
new file mode 100644
index 0000000..5656aa7
--- /dev/null
+++ b/debian/maintscript
@@ -0,0 +1,3 @@
+# FIXME: remove in 8.0
+rm_conffile /etc/apt/apt.conf.d/75pmgconf 7.1-5~ pmg-api
+
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





  reply	other threads:[~2022-08-31 17:06 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-31 17:06 [pmg-devel] [PATCH pmg-api v2 0/2] remove outdated apt.conf.d and future-proof lintian Stoiko Ivanov
2022-08-31 17:06 ` Stoiko Ivanov [this message]
2022-08-31 17:06 ` [pmg-devel] [PATCH pmg-api v2 2/2] d/lintian-overrides: add further future-proofing Stoiko Ivanov
2022-09-08 13:13 ` [pmg-devel] applied-series: [PATCH pmg-api v2 0/2] remove outdated apt.conf.d and future-proof lintian Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220831170630.171069-2-s.ivanov@proxmox.com \
    --to=s.ivanov@proxmox.com \
    --cc=pmg-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal