summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2020-05-25 15:30:18 +0200
committerJonathan Bauer2020-05-25 15:30:18 +0200
commit06137f4c2e9b94b4e3cfa3a772714f0f11bd16ba (patch)
treeb0ef36c342cd416809c989d75540143d650d74f0
parent[slx-builder] remove hardcoded dracut extra args (diff)
downloadansible-dracut-06137f4c2e9b94b4e3cfa3a772714f0f11bd16ba.tar.gz
ansible-dracut-06137f4c2e9b94b4e3cfa3a772714f0f11bd16ba.tar.xz
ansible-dracut-06137f4c2e9b94b4e3cfa3a772714f0f11bd16ba.zip
CentOS-8: remove hack and use kernel-qcow
-rw-r--r--slx-builder/tasks/build.yml9
-rw-r--r--slx-builder/vars/distro/CentOS-8.yml1
2 files changed, 1 insertions, 9 deletions
diff --git a/slx-builder/tasks/build.yml b/slx-builder/tasks/build.yml
index 5cae2b5..a0a38cd 100644
--- a/slx-builder/tasks/build.yml
+++ b/slx-builder/tasks/build.yml
@@ -4,15 +4,6 @@
args:
creates: "{{ builder_target }}"
-# TODO: use dracut option to prevent it from copying the system's loop kernel module:
-# --omit-driver loop
-# define variable for extra dracut args for example.
-- name: Remove default loop module
- shell: "cd {{ builder_path | dirname }}; mkdir tmp; cd tmp; /usr/lib/dracut/skipcpio ../initramfs | zcat | cpio -ivd; rm -f lib/modules/*/kernel/drivers/block/loop.ko.xz; find . | cpio -o -H newc > ../initramfs; cd ..; rm -rf tmp"
- when:
- - ansible_distribution == "CentOS"
- - ansible_distribution_major_version == "8"
-
- name: OpenSLX dracut | Retrieve initramfs and kernel (+ hack for weird /@ prefix of BOOT_IMAGE)
fetch:
src: "{{ item }}"
diff --git a/slx-builder/vars/distro/CentOS-8.yml b/slx-builder/vars/distro/CentOS-8.yml
index 9c88fa1..ff0154a 100644
--- a/slx-builder/vars/distro/CentOS-8.yml
+++ b/slx-builder/vars/distro/CentOS-8.yml
@@ -3,4 +3,5 @@ builder_extra_args: >-
--override-module module_dnbd3.commit=b57dadc2d
--override-module module_kernel_qcow2_linux.branch=kernel-qcow2-linux-4.18.x-centos
--override-module module_kernel_qcow2_linux.commit=0761b3e9e03
+ --qcow-handler kernel
- --omit-driver loop