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 233296503B for ; Mon, 31 Jan 2022 18:59:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 217B927232 for ; Mon, 31 Jan 2022 18:59:40 +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 93715271FD for ; Mon, 31 Jan 2022 18:59:38 +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 6A289461B2 for ; Mon, 31 Jan 2022 18:59:38 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Mon, 31 Jan 2022 18:59:15 +0100 Message-Id: <20220131175918.2099575-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220131175918.2099575-1-s.ivanov@proxmox.com> References: <20220131175918.2099575-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.262 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-kernel-meta 2/5] proxmox-boot: add get_first_line_from_file helper and use it 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: Mon, 31 Jan 2022 17:59:40 -0000 Signed-off-by: Stoiko Ivanov --- proxmox-boot/functions | 8 ++++++++ proxmox-boot/zz-proxmox-boot | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/proxmox-boot/functions b/proxmox-boot/functions index 6e19c20..4515a2d 100755 --- a/proxmox-boot/functions +++ b/proxmox-boot/functions @@ -101,3 +101,11 @@ loop_esp_list() { "$@" done } + +get_first_line() { + file="$1" + while IFS= read -r line || [ -n "$line" ]; do + break + done < "${file}" + echo "$line" +} diff --git a/proxmox-boot/zz-proxmox-boot b/proxmox-boot/zz-proxmox-boot index 90d4aa9..db73166 100755 --- a/proxmox-boot/zz-proxmox-boot +++ b/proxmox-boot/zz-proxmox-boot @@ -46,9 +46,7 @@ update_esps() { fi if [ -f /etc/kernel/cmdline ]; then # we can have cmdline files with multiple or no new line at all, handle both! - while IFS= read -r CMDLINE || [ -n "$CMDLINE" ]; do - break - done < /etc/kernel/cmdline + CMDLINE=$(get_first_line /etc/kernel/cmdline) echo ${CMDLINE} | grep -q 'root=' || \ { warn "No root= parameter in /etc/kernel/cmdline found!"; exit 1; } else -- 2.30.2