Skip to content

Commit b0d8338

Browse files
committed
Revert "bootlinux: fix os detection for 9p build dependency installation"
This reverts commit 0e9c8ac.
1 parent 555689a commit b0d8338

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

playbooks/roles/bootlinux/defaults/main.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,3 @@ bootlinux_fragment_x86: false
141141
bootlinux_fragment_xarray: false
142142
bootlinux_fragment_xarray_no_multi: false
143143

144-
145-
# Distro controls
146-
distro_debian_based: false
147-
distro_fedora: false
148-
distro_redhat_based: false
149-
distro_suse_based: false

playbooks/roles/bootlinux/tasks/build/9p.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
when:
1515
- target_linux_install_b4 is defined
1616
- target_linux_install_b4
17-
- not distro_debian_based|bool
17+
- ansible_facts['os_family']|lower != 'debian'
1818
run_once: true
1919
delegate_to: localhost
2020

playbooks/roles/bootlinux/tasks/install-deps/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
- name: Debian-specific setup
33
ansible.builtin.import_tasks: debian/main.yml
44
when:
5-
- distro_debian_based|bool
5+
- ansible_os_family == "Debian"
66

77
- name: SuSE-specific setup
88
ansible.builtin.import_tasks: suse/main.yml
99
when:
10-
- distro_suse_based|bool
10+
- ansible_os_family == "Suse"
1111

1212
- name: Red Hat-specific setup
1313
ansible.builtin.import_tasks: redhat/main.yml
1414
when:
15-
- distro_redhat_based|bool
15+
- ansible_os_family == "RedHat"

playbooks/roles/bootlinux/tasks/install-deps/redhat/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ansible.builtin.include_role:
44
name: epel-release
55
when:
6-
- not distro_fedora|bool
6+
- ansible_distribution != "Fedora"
77

88
- name: Install packages we care about
99
become: true
@@ -67,7 +67,7 @@
6767
vars:
6868
packages:
6969
- btrfs-progs
70-
when: distro_fedora|bool
70+
when: ansible_distribution == 'Fedora'
7171

7272
- name: Install clang
7373
become: true

0 commit comments

Comments
 (0)