From 708f7a1b9e730cb57869d2c83407ffa4d4521f5a Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 13 Nov 2011 10:36:20 +1100 Subject: locale.sh: remove leftovers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We were in certain situations still writing to locale.sh. While it would not have caused any harm, it was unintended and now removed. This change means that locale.sh will no longer load the consolemap. This would only be useful if it had been reset accidentally, and logging in again would then fix a broken console. The issue is described in FS#18759. It is not clear to me if this is still an issue, or if it solved by our new utf8/non-utf8 handling. Either way, resetting the consolemap unconditionaly does not make much sense in case the user has changed it on purpose. It might make sense to factor out the vconsole initialization into a "setup/repair my console" script, similar to systemd's /lib/systemd/systemd-vconsole-setup, but that would have to wait for a future release. Reported-by: Dave Reisner Cc: Роман Кирилич Signed-off-by: Tom Gundersen --- functions | 5 ----- 1 file changed, 5 deletions(-) diff --git a/functions b/functions index 8218d68..8f9a5d2 100644 --- a/functions +++ b/functions @@ -590,11 +590,6 @@ set_consolefont() { done if (( $? )); then stat_fail - elif [[ $CONSOLEMAP ]]; then - cat <<"EOF" >>/etc/profile.d/locale.sh -if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\033(K"; fi -EOF - stat_done else stat_done fi -- cgit v1.2.3