Fix registration of KeyTool in the bootloader

This accidentally used the complete path, rather than the relative
path in the ESP. Also get rid of machine-id, as that makes the boot
loader default to KeyTool, which is not what we want.

It's questionable to install stuff by machine-id, but I think it
has the benefit that we do not accidentally overwrite a KeyTool
signed by another key that is already in use.

Author: julian-klode

sicherboot

@@ -217,7 +217,8 @@ ENROLL_KEYS_HELP="Usage: sicherboot enroll-keys
   with KeyTool, so you can easily flash the new key.
 "
 enroll_keys() {
-    local image="$BOOT_EFI_DIR/$MACHINE_ID/KeyTool.efi"
+    local relative_image="$MACHINE_ID/KeyTool.efi"
+    local image="$BOOT_EFI_DIR/$relative_image"
     local conf="$BOOT_EFI_DIR/loader/entries/$MACHINE_ID-keytool.conf"
     local key_dir_rel="Keys/$MACHINE_ID"
     local key_dir="$BOOT_EFI_DIR/$key_dir_rel"
@@ -242,8 +243,7 @@ enroll_keys() {
     sign_image "$image"
 
     echo "title UEFI Key Setup Tool" > "$conf"
-    echo "machine-id $MACHINE_ID" >> "$conf"
-    echo "efi $image" >> "$conf"
+    echo "efi $relative_image" >> "$conf"
 
     echo "Installed KeyTool into the ESP."
     echo