summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJudd Vinet <judd@archlinux.org>2006-07-25 22:36:42 +0000
committerJudd Vinet <judd@archlinux.org>2006-07-25 22:36:42 +0000
commit977797d7a67033d03c4be04dba5b789ecdf2a36f (patch)
treeef13377b7fedb08172fc8a241769442f91238215
parent87132356080924e00822a4b24d593e94bb18e24a (diff)
set a default for LOCALE so it's no longer needed in /etc/profile
-rwxr-xr-xnetfs2
-rwxr-xr-xrc.sysinit22
2 files changed, 12 insertions, 12 deletions
diff --git a/netfs b/netfs
index 105d96f..6a490fc 100755
--- a/netfs
+++ b/netfs
@@ -15,7 +15,7 @@ case "$1" in
fi
;;
stop)
- stat_busy "Unmounting network filesystems"
+ stat_busy "Unmounting Network Filesystems"
umount -a -t nfs,smbfs,codafs,cifs,shfs,fuse
if [ $? -gt 0 ]; then
stat_fail
diff --git a/rc.sysinit b/rc.sysinit
index a6399ca..594dffb 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -233,20 +233,20 @@ fi
: >/etc/profile.d/locale.sh
chmod 755 /etc/profile.d/locale.sh
# Set user defined locale
-if [ "$LOCALE" != "" ]; then
- stat_busy "Setting Locale: $LOCALE"
- echo "export LANG=$LOCALE" >>/etc/profile.d/locale.sh
- stat_done
+[ "$LOCALE" != "" ] || LOCALE="en_US"
+stat_busy "Setting Locale: $LOCALE"
+echo "export LANG=$LOCALE" >>/etc/profile.d/locale.sh
+stat_done
# If locale is *.utf set console to Unicode mode
- if [ "`echo $LOCALE | /bin/grep -i utf`" ]; then
- stat_busy "Setting Consoles to UTF-8"
- /usr/bin/kbd_mode -u
- /usr/bin/dumpkeys | /bin/loadkeys --unicode
- echo 'if [ "$TERM" = "linux" -a isatty ]; then echo -ne "\e%G"; fi' >>/etc/profile.d/locale.sh
- stat_done
- fi
+if [ "`echo $LOCALE | /bin/grep -i utf`" ]; then
+ stat_busy "Setting Consoles to UTF-8"
+ /usr/bin/kbd_mode -u
+ /usr/bin/dumpkeys | /bin/loadkeys --unicode
+ echo 'if [ "$TERM" = "linux" -a isatty ]; then echo -ne "\e%G"; fi' >>/etc/profile.d/locale.sh
+ stat_done
fi
+
if [ "$CONSOLEFONT" != "" ]; then
stat_busy "Loading Console Font: $CONSOLEFONT"
for i in `seq 1 12`; do