diff options
| -rw-r--r-- | roles/bootstrap/tasks/install-archlinux.yml | 16 | ||||
| -rw-r--r-- | roles/bootstrap/templates/archlinux.conf.j2 | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/roles/bootstrap/tasks/install-archlinux.yml b/roles/bootstrap/tasks/install-archlinux.yml index 5c746a8..c467be8 100644 --- a/roles/bootstrap/tasks/install-archlinux.yml +++ b/roles/bootstrap/tasks/install-archlinux.yml @@ -36,12 +36,18 @@ - src: "archlinux.conf.j2" dest: "{{ mnt_boot_path }}/loader/entries/archlinux.conf" +- name: "Create distro kernel directory" + ansible.builtin.file: + path: "{{ mnt_boot_path }}/archlinux" + state: "directory" + mode: "0700" + - name: "Copy kernel to efi partition" ansible.builtin.copy: src: "{{ item }}" - dest: "{{ mnt_boot_path }}" + dest: "{{ mnt_boot_path }}/archlinux/" remote_src: true - mode: "0644" + mode: "0700" with_items: - "{{ mnt_root_path }}/boot/vmlinuz-linux" - "{{ mnt_root_path }}/boot/initramfs-linux.img" @@ -60,9 +66,9 @@ [Action] Description = Updating systemd-boot When = PostTransaction - Exec = /usr/bin/cp /boot/vmlinuz-linux /boot/efi/vmlinuz-linux - Exec = /usr/bin/cp /boot/initramfs-linux.img /boot/efi/initramfs-linux.img - Exec = /usr/bin/cp /boot/initramfs-linux-fallback.img /boot/efi/initramfs-linux-fallback.img + Exec = /usr/bin/cp /boot/vmlinuz-linux /boot/efi/archlinux/vmlinuz-linux + Exec = /usr/bin/cp /boot/initramfs-linux.img /boot/efi/archlinux/initramfs-linux.img + Exec = /usr/bin/cp /boot/initramfs-linux-fallback.img /boot/efi/archlinux/initramfs-linux-fallback.img - name: "Configure hostname in chroot" ansible.builtin.copy: diff --git a/roles/bootstrap/templates/archlinux.conf.j2 b/roles/bootstrap/templates/archlinux.conf.j2 index 5b35407..1f5cc7f 100644 --- a/roles/bootstrap/templates/archlinux.conf.j2 +++ b/roles/bootstrap/templates/archlinux.conf.j2 @@ -1,4 +1,4 @@ title Arch Linux -linux /vmlinuz-linux -initrd /initramfs-linux.img +linux /archlinux/vmlinuz-linux +initrd /archlinux/initramfs-linux.img options root=PARTLABEL={{ partition_root.name }} ro |