From 5d9e6b07bbb7de9fbb706cea05dbdaeff148dd45 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 4 Mar 2018 22:41:28 +0000
Subject: Rationalise and better document the configuration.

---
 files/blacklist-ide.conf         |  2 ++
 files/blacklist_ide.conf         |  2 --
 files/dracut-live.conf           | 16 ++++++++++++++++
 files/empty.conf                 |  0
 files/live-dracut.conf           | 16 ----------------
 files/live.51-mageia-resume.conf |  0
 files/live.modprobe.conf         |  0
 7 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 files/blacklist-ide.conf
 delete mode 100644 files/blacklist_ide.conf
 create mode 100644 files/dracut-live.conf
 create mode 100644 files/empty.conf
 delete mode 100644 files/live-dracut.conf
 delete mode 100644 files/live.51-mageia-resume.conf
 delete mode 100644 files/live.modprobe.conf

(limited to 'files')

diff --git a/files/blacklist-ide.conf b/files/blacklist-ide.conf
new file mode 100644
index 0000000..146e357
--- /dev/null
+++ b/files/blacklist-ide.conf
@@ -0,0 +1,2 @@
+# temp fix for 3395
+blacklist pata_acpi
diff --git a/files/blacklist_ide.conf b/files/blacklist_ide.conf
deleted file mode 100644
index 146e357..0000000
--- a/files/blacklist_ide.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# temp fix for 3395
-blacklist pata_acpi
diff --git a/files/dracut-live.conf b/files/dracut-live.conf
new file mode 100644
index 0000000..42b3e24
--- /dev/null
+++ b/files/dracut-live.conf
@@ -0,0 +1,16 @@
+# it is a live, build initrd to boot any hardware
+hostonly="no"
+# load mga livecd support
+add_dracutmodules+=" mgalive "
+# block some dracut modules we dont want / use
+omit_dracutmodules+=" caps crypt dm dmraid mdraid lvm nfs i18n resume modsign "
+# compress initrd with xz
+compress_l="xz"
+# whitelist only the filesystems needed by live CDs and live USB
+filesystems="iso9660 vfat =fs/nls squashfs overlay"
+# ensure drm drivers are available early in the boot sequence
+add_drivers+=" amdgpu radeon nouveau i915 vboxvideo "
+# fibre channel & iSCSI modules are unneeded on live CD/USB and pull 1MB+ of firmware files
+omit_drivers+=" qla1280 qla2xxx qla4xxx "
+# pata_acpi is not wanted on boot
+omit_drivers+=" pata_acpi "
diff --git a/files/empty.conf b/files/empty.conf
new file mode 100644
index 0000000..e69de29
diff --git a/files/live-dracut.conf b/files/live-dracut.conf
deleted file mode 100644
index 42b3e24..0000000
--- a/files/live-dracut.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# it is a live, build initrd to boot any hardware
-hostonly="no"
-# load mga livecd support
-add_dracutmodules+=" mgalive "
-# block some dracut modules we dont want / use
-omit_dracutmodules+=" caps crypt dm dmraid mdraid lvm nfs i18n resume modsign "
-# compress initrd with xz
-compress_l="xz"
-# whitelist only the filesystems needed by live CDs and live USB
-filesystems="iso9660 vfat =fs/nls squashfs overlay"
-# ensure drm drivers are available early in the boot sequence
-add_drivers+=" amdgpu radeon nouveau i915 vboxvideo "
-# fibre channel & iSCSI modules are unneeded on live CD/USB and pull 1MB+ of firmware files
-omit_drivers+=" qla1280 qla2xxx qla4xxx "
-# pata_acpi is not wanted on boot
-omit_drivers+=" pata_acpi "
diff --git a/files/live.51-mageia-resume.conf b/files/live.51-mageia-resume.conf
deleted file mode 100644
index e69de29..0000000
diff --git a/files/live.modprobe.conf b/files/live.modprobe.conf
deleted file mode 100644
index e69de29..0000000
-- 
cgit v1.2.1