aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonnie Barnes <djb@redhat.com>1998-05-06 20:07:52 +0000
committerDonnie Barnes <djb@redhat.com>1998-05-06 20:07:52 +0000
commit2fbfc3f8fbfd8d2935c5f3ea923c7c90e685c2da (patch)
tree9095d5c1229bf17133025c380ed21b7337830213
parent3b4f87394c6d288e2644979eb88c8b9da6382340 (diff)
downloadinitscripts-2fbfc3f8fbfd8d2935c5f3ea923c7c90e685c2da.tar
initscripts-2fbfc3f8fbfd8d2935c5f3ea923c7c90e685c2da.tar.gz
initscripts-2fbfc3f8fbfd8d2935c5f3ea923c7c90e685c2da.tar.bz2
initscripts-2fbfc3f8fbfd8d2935c5f3ea923c7c90e685c2da.tar.xz
initscripts-2fbfc3f8fbfd8d2935c5f3ea923c7c90e685c2da.zip
moved stuff to /etc/profile.d/lang.sh
-rw-r--r--Makefile3
-rw-r--r--initscripts.spec4
-rwxr-xr-xlang.sh15
-rwxr-xr-xrc.d/rc.sysinit16
4 files changed, 20 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 01866081..d95f45ef 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,11 @@ all:
(cd src; make CFLAGS="$(CFLAGS)")
install:
- mkdir -p $(ROOT)/etc $(ROOT)/sbin
+ mkdir -p $(ROOT)/etc/profile.d $(ROOT)/sbin
install -m644 -o root -g root inittab $(ROOT)/etc
install -m644 -o root -g root adjtime $(ROOT)/etc
install -m755 -o root -g root setsysfont $(ROOT)/sbin
+ install -m644 -o root -g root lang.sh $(ROOT)/etc/profile.d
cp -af rc.d sysconfig ppp $(ROOT)/etc
mkdir -p $(ROOT)/sbin
mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/sbin
diff --git a/initscripts.spec b/initscripts.spec
index 4d0d3b8f..2e0f2b04 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: inittab and /etc/rc.d scripts
Name: initscripts
-%define version 3.60
+%define version 3.61
Version: %{version}
Copyright: GPL
Group: Base
@@ -16,6 +16,7 @@ levels, and shut the system down cleanly. It also contains the scripts
that activate and deactivate most network interfaces.
%changelog
+
* Wed May 06 1998 Donnie Barnes <djb@redhat.com>
- added system font and language setting
@@ -403,6 +404,7 @@ rm -rf $RPM_BUILD_ROOT
%config(missingok) /etc/rc.d/init.d/*
%config /etc/rc.d/rc
%config /etc/rc.d/rc.local
+%config /etc/profile.d/lang.sh
/sbin/setsysfont
/bin/doexec
/bin/ipcalc
diff --git a/lang.sh b/lang.sh
new file mode 100755
index 00000000..5f17639f
--- /dev/null
+++ b/lang.sh
@@ -0,0 +1,15 @@
+if [ -f /etc/sysconfig/i18n ]; then
+ . /etc/sysconfig/i18n
+
+ if [ -n "$LANG" ]; then
+ export LANG
+ fi
+
+ if [ -n "$LINGUAS" ]; then
+ export LINGUAS
+ fi
+
+ if [ -n "$SYSTERM" ]; then
+ export TERM=$SYSTERM
+ fi
+fi
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 052b70b4..8f45aa13 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -32,22 +32,6 @@ else
domainname ""
fi
-if [ -f /etc/sysconfig/i18n ]; then
- . /etc/sysconfig/i18n
-fi
-
-if [ -n "$LANG" ]; then
- export LANG
-fi
-
-if [ -n "$LINGUAS" ]; then
- export LINGUAS
-fi
-
-if [ -n "$SYSTERM" ]; then
- export TERM=$SYSTERM
-fi
-
if [ -f /fsckoptions ]; then
fsckoptions=`cat /fsckoptions`
else