From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id A504D1FF17C for ; Wed, 25 Jun 2025 14:19:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 229F613B25; Wed, 25 Jun 2025 14:20:29 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Wed, 25 Jun 2025 14:20:11 +0200 Message-Id: <20250625122012.226237-2-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250625122012.226237-1-l.wagner@proxmox.com> References: <20250625122012.226237-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 manager 1/1] d/postinst: remove old pvemailforward migration logic 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Before the separate proxmox-mail-forward helper was split out into its own package, pve-manager shipped its own pvemailforward script. Arguably this is the reason why the code for migrating the path to the helper in /root/.forward is part of pve-manager's d/postinst script, not proxmox-mail-forward's. The pvemailforward -> proxmox-mail-forward migration happened in pve-manager 7.2-12. Since we don't support skipping major versions (e.g. 7 -> 9), we should be able to drop the migration code for PVE 9. This also means that proxmox-mail-forward is now fully in charge of the contents of /root/.forward. Signed-off-by: Lukas Wagner --- debian/postinst | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/debian/postinst b/debian/postinst index aba39904..6b706951 100755 --- a/debian/postinst +++ b/debian/postinst @@ -155,16 +155,6 @@ case "$1" in pveam update || true fi - # Always try to clean old entry, even when proxmox-mail-forward entry is already present. - # This ensures it will still be cleaned after an upgrade following a downgrade. - if test -f /root/.forward; then - sed -i '\!|/usr/bin/pvemailforward!d' /root/.forward - fi - - if ! test -f /root/.forward || ! grep -q '|/usr/bin/proxmox-mail-forward' /root/.forward; then - echo '|/usr/bin/proxmox-mail-forward' >>/root/.forward - fi - systemctl --system daemon-reload >/dev/null || true # same as dh_systemd_enable (code copied) -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel