[arch-projects] [mkinitcpio] [PATCH 10/18] drop support for reading /etc/rc.conf

[Dave Reisner]

Signed-off-by: Dave Reisner <dreisner at archlinux.org>
---
 install/consolefont | 9 ++-------
 install/keymap      | 5 ++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/install/consolefont b/install/consolefont
index 0bb1af6..bbcd7ec 100644
--- a/install/consolefont
+++ b/install/consolefont
@@ -3,11 +3,7 @@
 build() {
     # subshell to avoid namespace pollution
     (
-        for cfg in /etc/{rc,vconsole}.conf; do
-            [[ -s $cfg ]] && . "$cfg"
-        done
-
-        [[ $FONT ]] && CONSOLEFONT=$FONT
+        [[ -s /etc/vconsole.conf ]] && . /etc/vconsole.conf
 
         if [[ $CONSOLEFONT ]]; then
             for file in "/usr/share/kbd/consolefonts/$CONSOLEFONT".@(fnt|psf?(u))?(.gz); do
@@ -32,8 +28,7 @@ build() {
 
 help() {
     cat <<HELPEOF
-This hook loads consolefont specified in locale.conf or rc.conf during early
-userspace.
+This hook loads consolefont specified in locale.conf during early userspace.
 HELPEOF
 }
 
diff --git a/install/keymap b/install/keymap
index 99b816a..c1948b1 100644
--- a/install/keymap
+++ b/install/keymap
@@ -7,7 +7,7 @@ build() {
         l=$LANG
         unset LANG
 
-        for cfg in /etc/{rc,vconsole,locale}.conf; do
+        for cfg in /etc/{vconsole,locale}.conf; do
             [[ -s $cfg ]] && . "$cfg"
         done
 
@@ -29,8 +29,7 @@ build() {
 
 help() {
     cat <<HELPEOF
-This hook loads keymap(s) specified in vconsole.conf or rc.conf during early
-userspace.
+This hook loads keymap(s) specified in vconsole.conf during early userspace.
 HELPEOF
 }
 
-- 
1.8.0