From 39ec27b46007c65f02aab660e6e012722d1a2ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 22 May 2020 23:56:30 -0300
Subject: [PATCH] Split dracut.conf files.

---
 void/void.d/etc-x86/dracut.conf.d/05-luks.conf       |  3 +++
 void/void.d/etc-x86/dracut.conf.d/10-basic.conf      | 12 ------------
 void/void.d/etc-x86/dracut.conf.d/90-apparmor.conf   |  1 +
 void/void.d/etc-x86/dracut.conf.d/90-graphics.conf   |  2 ++
 void/void.d/etc-x86/dracut.conf.d/90-luks.conf       |  2 ++
 void/void.d/etc-x86/dracut.conf.d/90-secureboot.conf |  2 ++
 6 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 void/void.d/etc-x86/dracut.conf.d/05-luks.conf
 delete mode 100644 void/void.d/etc-x86/dracut.conf.d/10-basic.conf
 create mode 100644 void/void.d/etc-x86/dracut.conf.d/90-apparmor.conf
 create mode 100644 void/void.d/etc-x86/dracut.conf.d/90-graphics.conf
 create mode 100644 void/void.d/etc-x86/dracut.conf.d/90-luks.conf
 create mode 100644 void/void.d/etc-x86/dracut.conf.d/90-secureboot.conf

diff --git a/void/void.d/etc-x86/dracut.conf.d/05-luks.conf b/void/void.d/etc-x86/dracut.conf.d/05-luks.conf
new file mode 100644
index 0000000..1633059
--- /dev/null
+++ b/void/void.d/etc-x86/dracut.conf.d/05-luks.conf
@@ -0,0 +1,3 @@
+_root_uid="d1c8c628-aa7d-4247-8b10-e152fe66a2de"
+kernel_cmdline=" rd.luks.uuid=$_root_uid rd.luks.allow-discards "
+kernel_cmdline+=" root=/dev/mapper/luks-$_root_uid rw "
diff --git a/void/void.d/etc-x86/dracut.conf.d/10-basic.conf b/void/void.d/etc-x86/dracut.conf.d/10-basic.conf
deleted file mode 100644
index 8a44106..0000000
--- a/void/void.d/etc-x86/dracut.conf.d/10-basic.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-add_dracutmodules+=" crypt "
-omit_drivers+=" nouveau nvidia "
-filesystems+=" f2fs fat "
-
-_root_uid="d1c8c628-aa7d-4247-8b10-e152fe66a2de"
-kernel_cmdline="rd.luks.uuid=$_root_uid rd.luks.allow-discards"
-kernel_cmdline+=" root=/dev/mapper/luks-$_root_uid rw"
-kernel_cmdline+=" i915.enable_guc=2 apparmor=1 security=apparmor"
-kernel_cmdline+=" intel_iommu=igfx_off"
-
-uefi_secureboot_cert="/etc/keys/refind_local.crt"
-uefi_secureboot_key="/etc/keys/refind_local.key"
diff --git a/void/void.d/etc-x86/dracut.conf.d/90-apparmor.conf b/void/void.d/etc-x86/dracut.conf.d/90-apparmor.conf
new file mode 100644
index 0000000..26c044b
--- /dev/null
+++ b/void/void.d/etc-x86/dracut.conf.d/90-apparmor.conf
@@ -0,0 +1 @@
+kernel_cmdline+=" apparmor=1 security=apparmor "
diff --git a/void/void.d/etc-x86/dracut.conf.d/90-graphics.conf b/void/void.d/etc-x86/dracut.conf.d/90-graphics.conf
new file mode 100644
index 0000000..4f7aff7
--- /dev/null
+++ b/void/void.d/etc-x86/dracut.conf.d/90-graphics.conf
@@ -0,0 +1,2 @@
+omit_drivers+=" nouveau nvidia "
+kernel_cmdline+=" i915.enable_guc=2 intel_iommu=igfx_off "
diff --git a/void/void.d/etc-x86/dracut.conf.d/90-luks.conf b/void/void.d/etc-x86/dracut.conf.d/90-luks.conf
new file mode 100644
index 0000000..f576c18
--- /dev/null
+++ b/void/void.d/etc-x86/dracut.conf.d/90-luks.conf
@@ -0,0 +1,2 @@
+add_dracutmodules+=" crypt "
+filesystems+=" f2fs fat "
diff --git a/void/void.d/etc-x86/dracut.conf.d/90-secureboot.conf b/void/void.d/etc-x86/dracut.conf.d/90-secureboot.conf
new file mode 100644
index 0000000..32f8fca
--- /dev/null
+++ b/void/void.d/etc-x86/dracut.conf.d/90-secureboot.conf
@@ -0,0 +1,2 @@
+uefi_secureboot_cert="/etc/keys/refind_local.crt"
+uefi_secureboot_key="/etc/keys/refind_local.key"