more fixes for i18n from nkbj@image.dk, move inputrc to setup package

4 files changed, 28 insertions, 37 deletions

diff --git a/Makefile b/Makefile
index 394bb52b..bf1e4132 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,6 @@ install:
 	mkdir -p $(ROOT)/etc/profile.d $(ROOT)/sbin
 	install -m644  inittab $(ROOT)/etc
 	install -m644  adjtime $(ROOT)/etc
-	install -m644  inputrc $(ROOT)/etc
 	install -m755  setsysfont $(ROOT)/sbin
 	install -m755  lang.sh $(ROOT)/etc/profile.d
 	install -m755  service $(ROOT)/sbin
@@ -29,6 +28,9 @@ install:
 	chown root.root /var/run/netreport
 	chmod og=rwx,o=rx /var/run/netreport
 
+clean:
+	(cd src; make clean)
+
 tag-archive:
 	@cvs -Q tag -F $(CVSTAG)
 
diff --git a/initscripts.spec b/initscripts.spec
index 25be781f..d1eaf983 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -136,7 +136,6 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/sysconfig/network-scripts/ifup-aliases
 %config /etc/sysconfig/network-scripts/ifup-ipx
 %config /etc/inittab
-%config /etc/inputrc
 %dir    /etc/rc.d
 %config /etc/rc.d/rc.sysinit
 %dir    /etc/rc.d/rc0.d
diff --git a/lang.sh b/lang.sh
index e85fe9c8..c6996015 100755
--- a/lang.sh
+++ b/lang.sh
@@ -12,38 +12,19 @@ if [ -f /etc/sysconfig/i18n ]; then
     [ -n "$LC_ALL" ] && export LC_ALL || unset LC_ALL
     [ -n "$LANGUAGE" ] && export LANGUAGE || unset LANGUAGE
     [ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS
-
-    # deprecated
-    if [ -n "$SYSTERM" ]; then
-	export TERM=$SYSTERM
-    fi
+    [ -n "$_XKB_CHARSET" ] && export _XKB_CHARSET || unset _XKB_CHARSET
 
     if [ -n "$SYSFONTACM" ]; then
-        case $SYSFONTACM in
-	   iso01*|iso02*|iso15*|koi*)
-	        LESSCHARSET=latin1
-		export LESSCHARSET INPUTRC
+	case $SYSFONTACM in
+	    iso01*|iso02*|iso15*|koi*)
 		if [ "$TERM" = "linux" ]; then
 		    if ls -l /proc/$$/fd/0 2>/dev/null | grep -- '-> /dev/tty[0-9]*$' >/dev/null 2>&1; then
 			echo -n -e '\033(K' > /proc/$$/fd/0
 		    fi
 		fi
 		;;
-       esac
+	esac
     fi
-    
-    if [ -n "$INPUTRC" ]; then
-        export INPUTRC
-    fi
-    
-    if [ -n "$LESSCHARSET" ]; then
-        export LESSCHARSET
-    elif [ "$TERM" = "linux-lat" ]; then
-        LESSCHARSET=latin1
-	export LESSCHARSET
-    fi
-    
-    [ -n "$_XKB_CHARSET" ] && export _XKB_CHARSET || unset _XKB_CHARSET
 
     unset SYSFONTACM
 fi
diff --git a/sysconfig.txt b/sysconfig.txt
index d3709bf8..b74b561e 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -1,4 +1,3 @@
-
 Files in /etc/sysconfig
 =======================
 
@@ -17,6 +16,9 @@ Files in /etc/sysconfig
     ARC=true on alpha only indicates the ARC console's
       42-year time offset is in effect; otherwise the normal
       Unix epoch is assumed
+    ZONE="filename" indicates the zonefile under /usr/share/zoneinfo
+      that /etc/localtime is a copy of, for example:
+        ZONE="US/Eastern"
 
 /etc/sysconfig/init:
 
@@ -332,24 +334,31 @@ Files in /etc/sysconfig/network-scripts/
 /etc/sysconfig/i18n
 
   LANG= can be any two letter ISO language code
-  LC_ALL= is the setting of the localedata configuration (eg fr_CA)
-  LINGUAS= can be a : separated list of language codes
-  SYSTERM= use to set default TERM environment variable
-
-  The above four variables are used in rc.sysinit.
+  LC_CTYPE= localedata configuration for classification and conversion
+    of characters
+  LC_COLLATE= localedata configuration for collation (sort order) of
+    strings
+  LC_MESSAGES= localedata configuration for translation of yes and no
+    messages
+  LC_NUMERIC= localedata configuration for non-monetary numeric data
+  LC_MONETARY= localedata configuration for monetary data
+  LC_TIME= localedata configuration for date and time
+  LC_ALL= localedata configuration overriding all the above
+  LANGUAGE= can be any two letter ISO language code
+  LINGUAS= can be a : separated list of ISO language codes
+
+  The above variables are used in /etc/profile.d/lang.sh.
 
   SYSFONT= any font that is legal when used as
 	/usr/bin/consolechars -f $SYSFONT ...
-    (See console-tools package for sysfont command)
+    (See console-tools package for consolechars command)
 
-  UNIMAP= any unicode font that is legal fodder for
+  UNIMAP= any SFM (screen font map, formerly called Unicode mapping
+    table - see consolechars(8))
 	/usr/bin/consolechars -f $SYSFONT --sfm $UNIMAP
  
   SYSFONTACM= any ACM (application charset map - see consolechars(8))
         /usr/bin/consolechars -f $SYSFONT --acm $SYSFONTACM
  
   The above is used by the /sbin/setsysfont command (which is run
-  by rc.sysinit at boot time).
-
-
-
+  by rc.sysinit at boot time.)