5-auto-regen-zbm #13
							
								
								
									
										11
									
								
								setup.sh
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								setup.sh
									
									
									
									
									
								
							| @@ -671,12 +671,11 @@ EFI: | |||||||
|   ImageDir: /efi/EFI/ZBM |   ImageDir: /efi/EFI/ZBM | ||||||
|   Versions: false |   Versions: false | ||||||
|   Enabled: true |   Enabled: true | ||||||
|   Stub: /etc/zfsbootmenu/stub-loader.d/linuxx64.efi.stub |   Stub: /usr/share/zfsbootmenu/stubs/linuxx64.efi.stub  # workaround: https://github.com/zbm-dev/zfsbootmenu/discussions/501 | ||||||
| Kernel: | Kernel: | ||||||
|   CommandLine: ro loglevel=0 zbm.import_policy=hostid |   CommandLine: ro loglevel=0 zbm.import_policy=hostid | ||||||
|   Prefix: vmlinuz |   Prefix: vmlinuz | ||||||
| EOF | EOF | ||||||
|         get_known_good_stub_loader |  | ||||||
|     else |     else | ||||||
|         configure_syslinux |         configure_syslinux | ||||||
|         cat > '/etc/zfsbootmenu/config.yaml' <<EOF |         cat > '/etc/zfsbootmenu/config.yaml' <<EOF | ||||||
| @@ -701,14 +700,6 @@ EOF | |||||||
|     zfs set org.zfsbootmenu:commandline='rw nowatchdog rd.vconsole.keymap=de-latin1' "${zpool_name}"'/root/'"${zfs_arch_dataset_name}" |     zfs set org.zfsbootmenu:commandline='rw nowatchdog rd.vconsole.keymap=de-latin1' "${zpool_name}"'/root/'"${zfs_arch_dataset_name}" | ||||||
| } | } | ||||||
|  |  | ||||||
| function get_known_good_stub_loader () { |  | ||||||
|     local known_good_stub_loader local_stub_loader_abs |  | ||||||
|     known_good_stub_loader='https://github.com/zbm-dev/zfsbootmenu/raw/master/testing/stubs/linuxx64.efi.stub' |  | ||||||
|     local local_stub_loader_abs='/etc/zfsbootmenu/stub-loader.d/linuxx64.efi.stub' |  | ||||||
|     mkdir -p "$(dirname "${local_stub_loader_abs}")" |  | ||||||
|     curl --silent --location "${known_good_stub_loader}" --output "${local_stub_loader_abs}" |  | ||||||
| } |  | ||||||
|  |  | ||||||
| function add_syslinux_pacman_hook () { | function add_syslinux_pacman_hook () { | ||||||
|     mkdir -p '/opt/git/quico.space/quico-os-setup/zbm-syslinux-pacman-hook/branches/main' |     mkdir -p '/opt/git/quico.space/quico-os-setup/zbm-syslinux-pacman-hook/branches/main' | ||||||
|     git -C '/opt/git/quico.space/quico-os-setup/zbm-syslinux-pacman-hook/branches/main' clone 'https://quico.space/quico-os-setup/zbm-syslinux-pacman-hook.git' . |     git -C '/opt/git/quico.space/quico-os-setup/zbm-syslinux-pacman-hook/branches/main' clone 'https://quico.space/quico-os-setup/zbm-syslinux-pacman-hook.git' . | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user