public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH cluster] sysctl snippet: move to /usr/lib and prefix with 10-
Date: Thu, 11 Nov 2021 16:42:09 +0100	[thread overview]
Message-ID: <20211111154209.3773069-1-s.ivanov@proxmox.com> (raw)

following best-practices according to `sysctl.d(5)`:
* Packages should install their configuration files in /usr/lib/ ...
* It is recommended to prefix all filenames with a two-digit number
  and a dash ...

the conffile removal is inspired by how it was done in `procps` (one
of the few packages in the debian repository, which did this
transition) and by following `dpkg-maintscript-helper(1)` and
`deb-conffiles(5)` (the former recommending the latter)

The choice of 10- as prefix is due to pve-container shipping its
snippet with that prefix already. other packages use higher numbers
(e.g. systemd - 50-)

Tested on 2 VMs (one with modifications, the other without) - worked
as advertised (the modified file was kept as
/etc/sysctl.d/pve.conf.dpkg-old and the upgrade notified me of the
change)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/conffiles                          | 1 +
 debian/pve-cluster.install                | 2 +-
 debian/sysctl.d/{pve.conf => 10-pve.conf} | 0
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 debian/conffiles
 rename debian/sysctl.d/{pve.conf => 10-pve.conf} (100%)

diff --git a/debian/conffiles b/debian/conffiles
new file mode 100644
index 0000000..ef0558e
--- /dev/null
+++ b/debian/conffiles
@@ -0,0 +1 @@
+remove-on-upgrade /etc/sysctl.d/pve.conf
diff --git a/debian/pve-cluster.install b/debian/pve-cluster.install
index 407972a..f66cd06 100644
--- a/debian/pve-cluster.install
+++ b/debian/pve-cluster.install
@@ -1,4 +1,4 @@
-debian/sysctl.d/pve.conf etc/sysctl.d
+debian/sysctl.d/10-pve.conf usr/lib/sysctl.d
 usr/bin/create_pmxcfs_db
 usr/bin/pmxcfs
 usr/lib/
diff --git a/debian/sysctl.d/pve.conf b/debian/sysctl.d/10-pve.conf
similarity index 100%
rename from debian/sysctl.d/pve.conf
rename to debian/sysctl.d/10-pve.conf
-- 
2.30.2





             reply	other threads:[~2021-11-11 15:42 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-11 15:42 Stoiko Ivanov [this message]
2021-11-11 16:18 ` [pve-devel] applied: " 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=20211111154209.3773069-1-s.ivanov@proxmox.com \
    --to=s.ivanov@proxmox.com \
    --cc=pve-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