diff options
| author | Ahmed Abdelhalim <[email protected]> | 2025-08-11 00:33:34 +0200 |
|---|---|---|
| committer | Ahmed Abdelhalim <[email protected]> | 2025-08-11 00:33:34 +0200 |
| commit | 4e96a9abb248290a72a5bcf088ba16c1d6e2ab71 (patch) | |
| tree | a7075a97981c025a7fd50a9eb729886f54c74570 /roles | |
| parent | b94d56f916c275ba73e4cd668629652993a96107 (diff) | |
Minor refactoring to set hostname and fix rpi5 bootstrap
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/bootstrap/tasks/install-archlinux.yml | 6 | ||||
| -rw-r--r-- | roles/bootstrap/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/bootstrap/templates/raspberry.cmdline.j2 | 8 | ||||
| -rw-r--r-- | roles/bootstrap/templates/raspberry.config.j2 | 1 |
4 files changed, 8 insertions, 19 deletions
diff --git a/roles/bootstrap/tasks/install-archlinux.yml b/roles/bootstrap/tasks/install-archlinux.yml index f91b1eb..aa7d183 100644 --- a/roles/bootstrap/tasks/install-archlinux.yml +++ b/roles/bootstrap/tasks/install-archlinux.yml @@ -64,12 +64,6 @@ 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: - dest: "{{ mnt_root_path }}/etc/hostname" - mode: "0644" - content: "{{ hostname }}" - - name: "Configure pacman in chroot" ansible.builtin.copy: src: "/etc/pacman.conf" diff --git a/roles/bootstrap/tasks/main.yml b/roles/bootstrap/tasks/main.yml index 3c239bf..4e86312 100644 --- a/roles/bootstrap/tasks/main.yml +++ b/roles/bootstrap/tasks/main.yml @@ -20,13 +20,13 @@ ansible.builtin.include_tasks: "install-raspberry.yml" when: ansible_distribution == "Debian" - - name: "Configure hostname in chroot" - ansible.builtin.copy: - dest: "{{ mnt_root_path }}/etc/hostname" - mode: "0644" - content: "{{ hostname }}" - - name: "Ensure ansible dependencies are installed in chroot" ansible.builtin.command: cmd: "arch-chroot {{ mnt_root_path }} apt-get install -y python3" changed_when: true + +- name: "Configure hostname in chroot" + ansible.builtin.copy: + dest: "{{ mnt_root_path }}/etc/hostname" + mode: "0644" + content: "{{ hostname }}" diff --git a/roles/bootstrap/templates/raspberry.cmdline.j2 b/roles/bootstrap/templates/raspberry.cmdline.j2 index 3e47837..23390c4 100644 --- a/roles/bootstrap/templates/raspberry.cmdline.j2 +++ b/roles/bootstrap/templates/raspberry.cmdline.j2 @@ -1,7 +1 @@ -console=serial0,115200 \ -console=tty1 \ -root={{ partition_root.dev }} \ -rootfstype={{ partition_root.fstype }} \ -elevator=deadline \ -fsck.repair=yes \ -rootwait +console=serial0,115200 console=tty1 root={{ partition_root.dev }} rootfstype={{ partition_root.fstype }} elevator=deadline fsck.repair=yes rootwait diff --git a/roles/bootstrap/templates/raspberry.config.j2 b/roles/bootstrap/templates/raspberry.config.j2 index 7f02366..f4c1b40 100644 --- a/roles/bootstrap/templates/raspberry.config.j2 +++ b/roles/bootstrap/templates/raspberry.config.j2 @@ -1,4 +1,5 @@ [pi5] +kernel=kernel_2712.img dtparam=pciex1 dtparam=pciex1_gen=2 |