refactor(zbm): ZBM image names are now static, no need to regen UEFI boot entries (#5)

This commit is contained in:
2023-10-27 01:46:56 +02:00
parent 03ed6e076d
commit b0842ac9ba
2 changed files with 0 additions and 188 deletions

View File

@@ -18,7 +18,6 @@ exec 3>&1
declare this_script_url
this_script_url="${SCRIPT_URL:?}"
postconf_hook="$(dirname "${this_script_url}")"'/zbm_set_new_uefi_boot_entries.sh'
declare zpool_name zfs_arch_dataset_name
zpool_name='zpool'
@@ -658,13 +657,11 @@ function configure_zfsbootmenu () {
paru_install 'zfsbootmenu'
if [[ "${part_schema}" = 'gpt' ]]; then
mkdir -p '/etc/zfsbootmenu/posthooks.d'
cat > '/etc/zfsbootmenu/config.yaml' <<EOF
Global:
ManageImages: true
BootMountPoint: /efi
InitCPIO: true
PostHooksDir: /etc/zfsbootmenu/posthooks.d
Components:
Enabled: false
EFI:
@@ -860,13 +857,6 @@ function set_new_uefi_boot_entries () {
fi
}
function insert_zbm_postconf_hook () {
#3.9
declare postconf_target_abs='/mnt/etc/zfsbootmenu/posthooks.d/'"$(basename "${postconf_hook}")"
curl --silent --location "${postconf_hook}" --output "${postconf_target_abs}"
chmod +x "${postconf_target_abs}"
}
function umount_all () {
#3.10
if [[ "${part_schema}" = 'mbr' ]]; then
@@ -888,7 +878,6 @@ function finalize_os_setup () {
configure_zfs_mount_gen #3.7
if [[ "${part_schema}" = 'gpt' ]]; then
set_new_uefi_boot_entries #3.8
insert_zbm_postconf_hook #3.9
fi
umount_all #3.10
}