From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 3465F7EED8 for ; Thu, 11 Nov 2021 16:42:54 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 23442EA63 for ; Thu, 11 Nov 2021 16:42:24 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id BD657EA58 for ; Thu, 11 Nov 2021 16:42:22 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 90B3D44BD0 for ; Thu, 11 Nov 2021 16:42:22 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Thu, 11 Nov 2021 16:42:09 +0100 Message-Id: <20211111154209.3773069-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.325 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH cluster] sysctl snippet: move to /usr/lib and prefix with 10- X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2021 15:42:54 -0000 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 --- 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