quico-os-setup/arch-zbm
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

3-xen-orchestra-install #4

Merged
hygienic-books merged 84 commits from 3-xen-orchestra-install into main 2023-10-22 14:23:54 +00:00
Conversation 0 Commits 84 Files Changed 3 +3 -5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1a138068d1 - Show all commits

5
setup.sh
View File

@ -564,7 +564,7 @@ Components:
Enabled: false Enabled: false
EFI: EFI:
ImageDir: /efi/EFI/ZBM ImageDir: /efi/EFI/ZBM
Versions: 1 Versions: false
Enabled: true Enabled: true
Stub: /etc/zfsbootmenu/stub-loader.d/linuxx64.efi.stub Stub: /etc/zfsbootmenu/stub-loader.d/linuxx64.efi.stub
Kernel: Kernel:
@ -705,8 +705,7 @@ function set_new_uefi_boot_entries () {
efi_disks_list="$(get_disks_with_one_efipart)" efi_disks_list="$(get_disks_with_one_efipart)"
if grep -Piq -- '^'"${efi_drive}"'$' <<<"${efi_disks_list}"; then if grep -Piq -- '^'"${efi_drive}"'$' <<<"${efi_disks_list}"; then
for uefi_image in "${uefi_images[@]}"; do for uefi_image in "${uefi_images[@]}"; do
uefi_image_version="$(basename "${uefi_image##*-}")" uefi_image_version="$(basename "${uefi_image%%.EFI}")"
uefi_image_version="${uefi_image_version%%.EFI}"
uefi_image_inverted="${uefi_image#/mnt/efi}" uefi_image_inverted="${uefi_image#/mnt/efi}"
uefi_image_inverted="${uefi_image_inverted//\//\\}" uefi_image_inverted="${uefi_image_inverted//\//\\}"
efibootmgr --disk "${efi_drive}" \ efibootmgr --disk "${efi_drive}" \

3
zbm_set_new_uefi_boot_entries.sh
View File

@ -158,8 +158,7 @@ function set_new_uefi_boot_entries () {
efi_disks_list="$(get_disks_with_one_efipart)" efi_disks_list="$(get_disks_with_one_efipart)"
if grep -Piq -- '^'"${efi_drive}"'$' <<<"${efi_disks_list}"; then if grep -Piq -- '^'"${efi_drive}"'$' <<<"${efi_disks_list}"; then
for uefi_image in "${uefi_images[@]}"; do for uefi_image in "${uefi_images[@]}"; do
uefi_image_version="$(basename "${uefi_image##*-}")" uefi_image_version="$(basename "${uefi_image%%.EFI}")"
uefi_image_version="${uefi_image_version%%.EFI}"
uefi_image_inverted="${uefi_image#/efi}" uefi_image_inverted="${uefi_image#/efi}"
uefi_image_inverted="${uefi_image_inverted//\//\\}" uefi_image_inverted="${uefi_image_inverted//\//\\}"
efibootmgr --disk "${efi_drive}" \ efibootmgr --disk "${efi_drive}" \