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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B439074F68 for ; Tue, 20 Apr 2021 20:33:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A3E2527515 for ; Tue, 20 Apr 2021 20:33:55 +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 id B2A9A274F9 for ; Tue, 20 Apr 2021 20:33:53 +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 5560542DD3 for ; Tue, 20 Apr 2021 20:25:44 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Tue, 20 Apr 2021 20:25:39 +0200 Message-Id: <20210420182540.25204-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210420182540.25204-1-s.ivanov@proxmox.com> References: <20210420182540.25204-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 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] [RFC pve-kernel-meta 1/2] proxmox-boot-tool: rename from pve-efiboot-tool 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: Tue, 20 Apr 2021 18:33:55 -0000 We will be using the mechanics also for ZFS systems booting with BIOS legacy boot, and the tool is used also in PMG and PBS. A symlink is kept in place for compatibility reasons Signed-off-by: Stoiko Ivanov --- Makefile | 2 +- bin/Makefile | 2 +- bin/{pve-efiboot-tool => proxmox-boot-tool} | 0 debian/pve-kernel-helper.install | 2 +- debian/pve-kernel-helper.links | 1 + {efiboot => proxmox-boot}/Makefile | 0 {efiboot => proxmox-boot}/functions | 0 {efiboot => proxmox-boot}/pve-auto-removal | 0 {efiboot => proxmox-boot}/pve-efiboot-sync | 2 +- {efiboot => proxmox-boot}/zz-pve-efiboot | 0 10 files changed, 5 insertions(+), 4 deletions(-) rename bin/{pve-efiboot-tool => proxmox-boot-tool} (100%) create mode 100644 debian/pve-kernel-helper.links rename {efiboot => proxmox-boot}/Makefile (100%) rename {efiboot => proxmox-boot}/functions (100%) rename {efiboot => proxmox-boot}/pve-auto-removal (100%) rename {efiboot => proxmox-boot}/pve-efiboot-sync (84%) rename {efiboot => proxmox-boot}/zz-pve-efiboot (100%) diff --git a/Makefile b/Makefile index 0b62b3e..90d5989 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ BUILD_DIR=build DEBS=${KERNEL_DEB} ${HEADERS_DEB} ${HELPER_DEB} -SUBDIRS = efiboot bin +SUBDIRS = proxmox-boot bin .PHONY: all all: ${SUBDIRS} diff --git a/bin/Makefile b/bin/Makefile index 058c86f..b78fa42 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -5,7 +5,7 @@ all: install: install -d ${SBINDIR} - install -m 0755 pve-efiboot-tool ${SBINDIR}/ + install -m 0755 proxmox-boot-tool ${SBINDIR}/ .PHONY: clean distclean distclean: diff --git a/bin/pve-efiboot-tool b/bin/proxmox-boot-tool similarity index 100% rename from bin/pve-efiboot-tool rename to bin/proxmox-boot-tool diff --git a/debian/pve-kernel-helper.install b/debian/pve-kernel-helper.install index 6f7f713..82a9672 100644 --- a/debian/pve-kernel-helper.install +++ b/debian/pve-kernel-helper.install @@ -1,5 +1,5 @@ etc/kernel/postinst.d/* etc/kernel/postrm.d/* etc/initramfs/post-update.d/pve-efiboot-sync -usr/sbin/pve-efiboot-tool +usr/sbin/proxmox-boot-tool usr/share/pve-kernel-helper/scripts/functions diff --git a/debian/pve-kernel-helper.links b/debian/pve-kernel-helper.links new file mode 100644 index 0000000..70bf372 --- /dev/null +++ b/debian/pve-kernel-helper.links @@ -0,0 +1 @@ +/usr/sbin/proxmox-boot-tool /usr/sbin/pve-efiboot-tool diff --git a/efiboot/Makefile b/proxmox-boot/Makefile similarity index 100% rename from efiboot/Makefile rename to proxmox-boot/Makefile diff --git a/efiboot/functions b/proxmox-boot/functions similarity index 100% rename from efiboot/functions rename to proxmox-boot/functions diff --git a/efiboot/pve-auto-removal b/proxmox-boot/pve-auto-removal similarity index 100% rename from efiboot/pve-auto-removal rename to proxmox-boot/pve-auto-removal diff --git a/efiboot/pve-efiboot-sync b/proxmox-boot/pve-efiboot-sync similarity index 84% rename from efiboot/pve-efiboot-sync rename to proxmox-boot/pve-efiboot-sync index c3ccf8e..21adc85 100644 --- a/efiboot/pve-efiboot-sync +++ b/proxmox-boot/pve-efiboot-sync @@ -7,5 +7,5 @@ set -e # this variable will be set to 1 and we do nothing, since our pve-kernel # hooks will update the ESPs all at once anyway. if [ -z "$INITRAMFS_TOOLS_KERNEL_HOOK" ]; then - /usr/sbin/pve-efiboot-tool refresh --hook 'zz-pve-efiboot' + /usr/sbin/proxmox-boot-tool refresh --hook 'zz-pve-efiboot' fi diff --git a/efiboot/zz-pve-efiboot b/proxmox-boot/zz-pve-efiboot similarity index 100% rename from efiboot/zz-pve-efiboot rename to proxmox-boot/zz-pve-efiboot -- 2.20.1