From 64b2e84c3ce91ed98f6138bd6c66374f961d29d6 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Thu, 23 Aug 2012 16:24:39 +0200
Subject: [PATCH] start removing conf.d files

---
 usr/lib/initcpio/install/arch_cpufreq     |  1 -
 usr/lib/initcpio/install/arch_kexec       |  1 -
 usr/lib/initcpio/install/arch_wireless    |  3 ---
 usr/share/archboot/kexec/etc/conf.d/kexec | 16 ----------------
 4 files changed, 21 deletions(-)
 delete mode 100644 usr/share/archboot/kexec/etc/conf.d/kexec

diff --git a/usr/lib/initcpio/install/arch_cpufreq b/usr/lib/initcpio/install/arch_cpufreq
index dd3e3b358..6cfbdd2f1 100644
--- a/usr/lib/initcpio/install/arch_cpufreq
+++ b/usr/lib/initcpio/install/arch_cpufreq
@@ -6,7 +6,6 @@ build ()
     add_checked_modules 'arch/x86/kernel/cpu/cpufreq|drivers/cpufreq'
     add_binary "/usr/bin/cpupower"
     add_file "/usr/bin/cpufreq-bench_plot.sh"
-    add_file "/etc/conf.d/cpupower"
     add_file "/etc/cpufreq-bench.conf"
 }
 
diff --git a/usr/lib/initcpio/install/arch_kexec b/usr/lib/initcpio/install/arch_kexec
index 13cc37b89..b965f1817 100644
--- a/usr/lib/initcpio/install/arch_kexec
+++ b/usr/lib/initcpio/install/arch_kexec
@@ -4,7 +4,6 @@
 build ()
 {
     add_binary "/sbin/kexec"
-    add_file "/usr/share/archboot/kexec/etc/conf.d/kexec" "/etc/conf.d/kexec"
 }
 
 help ()
diff --git a/usr/lib/initcpio/install/arch_wireless b/usr/lib/initcpio/install/arch_wireless
index 5c22f99e4..402207d78 100644
--- a/usr/lib/initcpio/install/arch_wireless
+++ b/usr/lib/initcpio/install/arch_wireless
@@ -10,10 +10,7 @@ build ()
     for i in $apps; do
         add_binary "$i"
     done
-    add_file "/etc/conf.d/wireless"
     add_file "/etc/wpa_supplicant.conf"
-    # add rfkill
-    add_file "/etc/conf.d/rfkill"
     # add zd1211 firmware files
     for i in /usr/lib/firmware/zd1211/* ; do
 	add_file "$i"
diff --git a/usr/share/archboot/kexec/etc/conf.d/kexec b/usr/share/archboot/kexec/etc/conf.d/kexec
deleted file mode 100644
index 644b9c68e..000000000
--- a/usr/share/archboot/kexec/etc/conf.d/kexec
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Configuration for Kexec
-#
-
-# Path to kernel, default to stock arch kernel
-KPATH="/install/boot/vmlinuz-linux"
-
-# Root partition
-# The default attempts to autodetect
-ROOTPART="$(mount | grep "on /install type" | cut -d' ' -f 1)"
-
-# Additional kernel parameters
-KPARAM="ro"
-
-# Path to initrd image, default to stock arch kernel
-INITRD="/install/boot/initramfs-linux.img"