setup.sh

@@ -493,14 +493,29 @@ function paru_install () {
     fi
 }
 
-function install_zbm_image () {
+function configure_zfsbootmenu () {
-    #2.8
+    #3.8
-    # This takes image files written earlier in our Arch Linux live CD ISO
+    #FIXME
-    # image at prepare_zfsbootmenu_efi_bin_pkg() and installs them via their
+    paru_install 'zfsbootmenu'
-    # locally built package file. When done we delete the manually built
+    mkdir -p '/etc/zfsbootmenu/posthooks.d'
-    # package file from pacman's cache dir.
+    cat > '/etc/zfsbootmenu/config.yaml' <<EOF
-    pacman -U "${ZFSBOOTMENU_EFI_BIN_PKG_PATH}" --noconfirm
+Global:
-    rm "${ZFSBOOTMENU_EFI_BIN_PKG_PATH}"
+  ManageImages: true
+  BootMountPoint: /efi
+  InitCPIO: true
+  PostHooksDir: /etc/zfsbootmenu/posthooks.d
+Components:
+  Enabled: false
+EFI:
+  ImageDir: /efi/EFI/ZBM
+  Versions: 1
+  Enabled: true
+Kernel:
+  CommandLine: ro loglevel=0 zbm.import_policy=hostid
+  Prefix: vmlinuz
+EOF
+# Up here maybe 'ro quiet' instead of 'ro'
+    zfs set org.zfsbootmenu:commandline='rw nowatchdog rd.vconsole.keymap=de-latin1' "${zpool_name}"'/root/'"${zfs_arch_dataset_name}"
 }
 
 function keep_initiramfs_root_only_rw () {
@@ -579,7 +594,8 @@ function install_os_in_chroot () {
     mkinitcpio -P
 
     # Install ZFSBootMenu image
-    install_zbm_image                           #2.8
+    configure_zfsbootmenu                       #3.8 #FIXME
+    generate-zbm
 }
 
 function set_root_pw () {