diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-11-15 01:55:00 +0100 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2012-11-24 00:01:34 +0100 |
| commit | ac8499c08279b05dc582cc65d9e73deda5d38572 (patch) | |
| tree | dd1bedc1dea06cdeec7c31e8e5018ba1499e6e65 | |
| parent | a3889c6914f7fac5a5b7a438be4233bcf66db44c (diff) | |
| download | mkinitcpio-ac8499c08279b05dc582cc65d9e73deda5d38572.tar.gz mkinitcpio-ac8499c08279b05dc582cc65d9e73deda5d38572.tar.xz | |
drop support for reading /etc/rc.conf
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
| -rw-r--r-- | install/consolefont | 9 | ||||
| -rw-r--r-- | 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 } |