10 files changed, 18 insertions, 18 deletions
diff --git a/roles/bootstrap/tasks/install-archlinux.yml b/roles/bootstrap/tasks/install-archlinux.yml
index 642469b..441d448 100644
--- a/roles/bootstrap/tasks/install-archlinux.yml
+++ b/roles/bootstrap/tasks/install-archlinux.yml
@@ -78,21 +78,17 @@
 
 - name: "Configure Arch Linux boot entries"
   ansible.builtin.template:
-    src: "refind_arch.conf.j2"
-    dest: "{{ mnt_boot_path }}/EFI/BOOT/arch.conf"
+    src: "archlinux/archlinux.conf.j2"
+    dest: "{{ mnt_boot_path }}/EFI/BOOT/archlinux.conf"
     mode: "0644"
   # NOTE: this is skipped because the docker test doesn't have proper EFI/BOOT directory created
   tags: ["molecule-notest"]
 
 - name: "Install kernel sync script for EFI partition"
-  ansible.builtin.copy:
+  ansible.builtin.template:
+    src: "archlinux/refind-sync-kernel.j2"
     dest: "{{ mnt_root_path }}/usr/local/bin/refind-sync-kernel"
     mode: "0755"
-    content: |
-      #!/bin/sh
-      mkdir -p /boot/efi/EFI/arch
-      cp /boot/vmlinuz-linux /boot/efi/EFI/arch/
-      cp /boot/initramfs-linux.img /boot/efi/EFI/arch/
 
 - name: "Configure pacman hook for rEFInd kernel updates"
   ansible.builtin.copy:
diff --git a/roles/bootstrap/tasks/install-raspberry.yml b/roles/bootstrap/tasks/install-raspberry.yml
index a85a168..179b6a8 100644
--- a/roles/bootstrap/tasks/install-raspberry.yml
+++ b/roles/bootstrap/tasks/install-raspberry.yml
@@ -75,9 +75,9 @@
     dest: "{{ item.dest }}"
     mode: "0644"
   loop:
-    - src: "raspberry.config.j2"
+    - src: "raspberry/raspberry.config.j2"
       dest: "{{ mnt_boot_path }}/config.txt"
-    - src: "raspberry.cmdline.j2"
+    - src: "raspberry/raspberry.cmdline.j2"
       dest: "{{ mnt_boot_path }}/cmdline.txt"
 
 - name: "Configure boot order"
diff --git a/roles/bootstrap/tasks/install-ubuntu.yml b/roles/bootstrap/tasks/install-ubuntu.yml
index 89f351f..3329ff5 100644
--- a/roles/bootstrap/tasks/install-ubuntu.yml
+++ b/roles/bootstrap/tasks/install-ubuntu.yml
@@ -99,7 +99,7 @@
 
 - name: "Configure Ubuntu boot entries"
   ansible.builtin.template:
-    src: "refind_ubuntu.conf.j2"
+    src: "ubuntu/ubuntu.conf.j2"
     dest: "{{ mnt_boot_path }}/EFI/BOOT/ubuntu.conf"
     mode: "0644"
   # NOTE: this is skipped because the docker test doesn't have proper EFI/BOOT directory created
@@ -112,11 +112,7 @@
     mode: "0755"
 
 - name: "Install kernel sync script for EFI partition"
-  ansible.builtin.copy:
+  ansible.builtin.template:
+    src: "ubuntu/refind-sync-kernel.j2"
     dest: "{{ mnt_root_path }}/etc/kernel/postinst.d/refind-sync-kernel"
     mode: "0755"
-    content: |
-      #!/bin/sh
-      mkdir -p /boot/efi/EFI/ubuntu
-      cp /boot/vmlinuz /boot/efi/EFI/ubuntu/
-      cp /boot/initrd.img /boot/efi/EFI/ubuntu/
diff --git a/roles/bootstrap/templates/refind_arch.conf.j2 b/roles/bootstrap/templates/archlinux/archlinux.conf.j2
index 0551cb3..0551cb3 100644
--- a/roles/bootstrap/templates/refind_arch.conf.j2
+++ b/roles/bootstrap/templates/archlinux/archlinux.conf.j2
diff --git a/roles/bootstrap/templates/archlinux/refind-sync-kernel.j2 b/roles/bootstrap/templates/archlinux/refind-sync-kernel.j2
new file mode 100644
index 0000000..c53ed96
--- /dev/null
+++ b/roles/bootstrap/templates/archlinux/refind-sync-kernel.j2
@@ -0,0 +1,4 @@
+#!/bin/sh
+mkdir -p /boot/efi/EFI/arch
+cp /boot/vmlinuz-linux /boot/efi/EFI/arch/
+cp /boot/initramfs-linux.img /boot/efi/EFI/arch/
diff --git a/roles/bootstrap/templates/raspberry.cmdline.j2 b/roles/bootstrap/templates/raspberry/raspberry.cmdline.j2
index 23390c4..23390c4 100644
--- a/roles/bootstrap/templates/raspberry.cmdline.j2
+++ b/roles/bootstrap/templates/raspberry/raspberry.cmdline.j2
diff --git a/roles/bootstrap/templates/raspberry.config.j2 b/roles/bootstrap/templates/raspberry/raspberry.config.j2
index 0faa3df..0faa3df 100644
--- a/roles/bootstrap/templates/raspberry.config.j2
+++ b/roles/bootstrap/templates/raspberry/raspberry.config.j2
diff --git a/roles/bootstrap/templates/refind.conf.j2 b/roles/bootstrap/templates/refind.conf.j2
index 3b15a3d..c12ea1c 100644
--- a/roles/bootstrap/templates/refind.conf.j2
+++ b/roles/bootstrap/templates/refind.conf.j2
@@ -7,4 +7,4 @@ hideui hints
 spoof_osx_version 12.7
 {% endif %}
 include ubuntu.conf
-include arch.conf
+include archlinux.conf
diff --git a/roles/bootstrap/templates/ubuntu/refind-sync-kernel.j2 b/roles/bootstrap/templates/ubuntu/refind-sync-kernel.j2
new file mode 100644
index 0000000..3b72d4e
--- /dev/null
+++ b/roles/bootstrap/templates/ubuntu/refind-sync-kernel.j2
@@ -0,0 +1,4 @@
+#!/bin/sh
+mkdir -p /boot/efi/EFI/ubuntu
+cp /boot/vmlinuz /boot/efi/EFI/ubuntu/
+cp /boot/initrd.img /boot/efi/EFI/ubuntu/
diff --git a/roles/bootstrap/templates/refind_ubuntu.conf.j2 b/roles/bootstrap/templates/ubuntu/ubuntu.conf.j2
index 20d5586..20d5586 100644
--- a/roles/bootstrap/templates/refind_ubuntu.conf.j2
+++ b/roles/bootstrap/templates/ubuntu/ubuntu.conf.j2