From eb5720331bf72ae9ac97d77b0f7c48c3a3fb7980 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 1 Jun 2023 10:06:07 +0300
Subject: [PATCH] configs/: move custom mkinitcpio.conf files to
 /etc/mkinitcpio.conf.d/

This allows to retain a pristine /etc/mkinitcpio.conf in the rootfs.
---
 CHANGELOG.rst                                                   | 2 ++
 .../etc/{mkinitcpio.conf => mkinitcpio.conf.d/archiso.conf}     | 0
 configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset         | 2 +-
 .../etc/{mkinitcpio.conf => mkinitcpio.conf.d/archiso.conf}     | 0
 configs/releng/airootfs/etc/mkinitcpio.d/linux.preset           | 2 +-
 5 files changed, 4 insertions(+), 2 deletions(-)
 rename configs/baseline/airootfs/etc/{mkinitcpio.conf => mkinitcpio.conf.d/archiso.conf} (100%)
 rename configs/releng/airootfs/etc/{mkinitcpio.conf => mkinitcpio.conf.d/archiso.conf} (100%)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cab4633..18051a6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -11,6 +11,8 @@ Added
 Changed
 -------
 
+- Moved custom ``mkinitcpio.conf`` files to ``/etc/mkinitcpio.conf.d/archiso.conf``.
+
 Deprecated
 ----------
 
diff --git a/configs/baseline/airootfs/etc/mkinitcpio.conf b/configs/baseline/airootfs/etc/mkinitcpio.conf.d/archiso.conf
similarity index 100%
rename from configs/baseline/airootfs/etc/mkinitcpio.conf
rename to configs/baseline/airootfs/etc/mkinitcpio.conf.d/archiso.conf
diff --git a/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset b/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset
index 9f67184..8e85205 100644
--- a/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset
+++ b/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset
@@ -3,6 +3,6 @@
 PRESETS=('archiso')
 
 ALL_kver='/boot/vmlinuz-linux'
-ALL_config='/etc/mkinitcpio.conf'
+archiso_config='/etc/mkinitcpio.conf.d/archiso.conf'
 
 archiso_image="/boot/initramfs-linux.img"
diff --git a/configs/releng/airootfs/etc/mkinitcpio.conf b/configs/releng/airootfs/etc/mkinitcpio.conf.d/archiso.conf
similarity index 100%
rename from configs/releng/airootfs/etc/mkinitcpio.conf
rename to configs/releng/airootfs/etc/mkinitcpio.conf.d/archiso.conf
diff --git a/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset b/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset
index 9f67184..8e85205 100644
--- a/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset
+++ b/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset
@@ -3,6 +3,6 @@
 PRESETS=('archiso')
 
 ALL_kver='/boot/vmlinuz-linux'
-ALL_config='/etc/mkinitcpio.conf'
+archiso_config='/etc/mkinitcpio.conf.d/archiso.conf'
 
 archiso_image="/boot/initramfs-linux.img"