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 4A1F78DAF for ; Fri, 23 Jun 2023 08:14:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 243792E9AB for ; Fri, 23 Jun 2023 08:14:27 +0200 (CEST) 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 for ; Fri, 23 Jun 2023 08:14:26 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CEDE642D3B for ; Fri, 23 Jun 2023 08:14:25 +0200 (CEST) From: Hannes Laimer To: pve-devel@lists.proxmox.com Date: Fri, 23 Jun 2023 08:13:52 +0200 Message-Id: <20230623061352.81107-1-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.012 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [file.new] Subject: [pve-devel] [PATCH proxmox-kernel-helper] boot tool: fix grep misinterpretation of arguments starting with a hyphen 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: Fri, 23 Jun 2023 06:14:57 -0000 `proxmox-boot-tool kernel remove --help`, or any version agrument that started with a '-', lead to the grep usage message being written into /etc/kernel/proxmox-boot-manual-kernels. The problem was `grep` interpreted the kernel version agrument as an option since it starts with '-'. --- src/bin/proxmox-boot-tool | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/proxmox-boot-tool b/src/bin/proxmox-boot-tool index 913b0f6..302974b 100755 --- a/src/bin/proxmox-boot-tool +++ b/src/bin/proxmox-boot-tool @@ -27,7 +27,7 @@ _remove_entry_from_list_file() { fi if [ -e "$file" ]; then - grep -vFx "$entry" "$file" > "$file.new" || true + grep -vFx -- "$entry" "$file" > "$file.new" || true mv "$file.new" "$file" else echo "'$file' does not exist.." @@ -279,7 +279,7 @@ remove_kernel() { exit 1 fi - if grep -sqFx "$ver" "$MANUAL_KERNEL_LIST"; then + if grep -sqFx -- "$ver" "$MANUAL_KERNEL_LIST"; then _remove_entry_from_list_file "$MANUAL_KERNEL_LIST" "$ver" echo "Removed kernel '$ver' from manual kernel list. Use the 'refresh' command to update the ESPs." else -- 2.39.2