summaryrefslogtreecommitdiffstats
path: root/roles/bootstrap
diff options
context:
space:
mode:
Diffstat (limited to 'roles/bootstrap')
-rw-r--r--roles/bootstrap/tasks/install-ubuntu.yml (renamed from roles/bootstrap/tasks/install-debian.yml)3
-rw-r--r--roles/bootstrap/tasks/main.yml6
-rw-r--r--roles/bootstrap/vars/ubuntu.yml4
3 files changed, 7 insertions, 6 deletions
diff --git a/roles/bootstrap/tasks/install-debian.yml b/roles/bootstrap/tasks/install-ubuntu.yml
index 05d84e9..9e6801f 100644
--- a/roles/bootstrap/tasks/install-debian.yml
+++ b/roles/bootstrap/tasks/install-ubuntu.yml
@@ -48,8 +48,7 @@
changed_when: true
with_items:
- "apt-get update"
- - "apt-get install -y {{ bootstrap_distro.kernel_packages | join(' ') }}"
- - "apt-get install -y systemd-boot systemd-boot-efi"
+ - "apt-get install -y {{ bootstrap_distro.packages | join(' ') }}"
- name: "Run bootclt"
ansible.builtin.command:
diff --git a/roles/bootstrap/tasks/main.yml b/roles/bootstrap/tasks/main.yml
index af5dc49..723561d 100644
--- a/roles/bootstrap/tasks/main.yml
+++ b/roles/bootstrap/tasks/main.yml
@@ -9,6 +9,6 @@
ansible.builtin.include_tasks: "install-archlinux.yml"
when: ansible_os_family == "Archlinux"
-- name: "Install debian"
- ansible.builtin.include_tasks: "install-debian.yml"
- when: ansible_os_family == "Debian"
+- name: "Install ubuntu"
+ ansible.builtin.include_tasks: "install-ubuntu.yml"
+ when: ansible_os_distribution == "Ubuntu"
diff --git a/roles/bootstrap/vars/ubuntu.yml b/roles/bootstrap/vars/ubuntu.yml
index 829ecae..1116087 100644
--- a/roles/bootstrap/vars/ubuntu.yml
+++ b/roles/bootstrap/vars/ubuntu.yml
@@ -2,8 +2,10 @@
bootstrap_distro:
name: "noble" # => Ubuntu 24.04
mirror_url: "http://archive.ubuntu.com/ubuntu/"
- kernel_packages:
+ install_packages:
- "linux-generic-hwe-24.04"
+ - "systemd-boot"
+ - "systemd-boot-efi"
bootstrap_opts: ""