From 4ef7a256acddfdd0cbb54e9018f0d8fadbc0cae1 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Fri, 5 Aug 2011 00:33:10 +0200 Subject: locale: make /etc/profile.d/locale.sh dynamic locale.sh parses rc.conf at runtime and sets the LOCALE accordingly, rather than writing a static file at every boot. This eliminates yet another write to /etc. Signed-off-by: Tom Gundersen --- Makefile | 2 ++ rc.sysinit | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2d68ee3..4916387 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ DIRS := \ /etc/conf.d \ /etc/rc.d/functions.d \ /etc/logrotate.d \ + /etc/profile.d \ /usr/sbin \ /etc/tmpfiles.d \ /usr/lib/tmpfiles.d \ @@ -22,6 +23,7 @@ install: minilogd installdirs install -m644 -t $(DESTDIR)/etc/logrotate.d bootlog install -m644 -t $(DESTDIR)/etc/rc.d functions install -m755 -t $(DESTDIR)/etc/rc.d hwclock network netfs + install -m755 -t $(DESTDIR)/etc/profile.d locale.sh install -m755 -t $(DESTDIR)/usr/sbin minilogd rc.d install -m755 -t $(DESTDIR)/usr/lib/initscripts arch-tmpfiles install -m644 tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d/arch.conf diff --git a/rc.sysinit b/rc.sysinit index 86febfa..9f215c4 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -238,11 +238,6 @@ if [[ $HOSTNAME ]]; then echo "$HOSTNAME" >| /proc/sys/kernel/hostname && stat_done || stat_fail fi -# Flush old locale settings and set user defined locale -stat_busy "Setting Locale: ${LOCALE:=en_US}" - echo "export LANG=$LOCALE" > /etc/profile.d/locale.sh && -chmod 0755 /etc/profile.d/locale.sh && stat_done || stat_fail - if [[ ${LOCALE,,} =~ utf ]]; then stat_busy "Setting Consoles to UTF-8 mode" # UTF-8 consoles are default since 2.6.24 kernel -- cgit v1.2.3