aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2001-01-23 21:22:32 +0000
committerBill Nottingham <notting@redhat.com>2001-01-23 21:22:32 +0000
commit449aafc07527f8c530e7c9576e31d412a331a030 (patch)
treed046e6c4c8191776489cd224939af69e133c5bed
parent2f549b3f161d2fd0ed74eac79baef61be44174ea (diff)
downloadinitscripts-449aafc07527f8c530e7c9576e31d412a331a030.tar
initscripts-449aafc07527f8c530e7c9576e31d412a331a030.tar.gz
initscripts-449aafc07527f8c530e7c9576e31d412a331a030.tar.bz2
initscripts-449aafc07527f8c530e7c9576e31d412a331a030.tar.xz
initscripts-449aafc07527f8c530e7c9576e31d412a331a030.zip
fix up i18n stuff so it works
deal with new location of console-tools stuff fix network up/down logic
-rwxr-xr-xrc.d/init.d/functions5
-rwxr-xr-xrc.d/init.d/network10
-rwxr-xr-xrc.d/rc.sysinit6
3 files changed, 15 insertions, 6 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index e6ee9b81..0ec784b6 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -20,6 +20,11 @@ export PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"
# Get a sane screen width
[ -z "$COLUMNS" ] && COLUMNS=80
+if [ -f /etc/sysconfig/i18n ] ; then
+ . /etc/sysconfig/i18n
+ LC_MESSAGES=$LANG
+fi
+
# Read in our configuration
if [ -z "$BOOTUP" ]; then
if [ -f /etc/sysconfig/init ]; then
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index db379c53..0a5eee57 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -59,10 +59,12 @@ case "$1" in
esac
for i in $interfaces; do
- if egrep -L "^ONBOOT=\"?[Nn][Oo]\"?" ifcfg-$i >/dev/null 2>&1 && [ "${i##eth}" != "$i" ]; then
- # Probe module to preserve interface ordering
- if [ -n "`modprobe -vn $i | grep -v Note:`" ]; then
- /sbin/ifconfig $i >/dev/null 2>&1
+ if egrep -L "^ONBOOT=\"?[Nn][Oo]\"?" ifcfg-$i >/dev/null 2>&1 ; then
+ if [ "${i##eth}" != "$i" ]; then
+ # Probe module to preserve interface ordering
+ if [ -n "`modprobe -vn $i | grep -v Note:`" ]; then
+ /sbin/ifconfig $i >/dev/null 2>&1
+ fi
fi
else
# If we're in confirmation mode, get user confirmation
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 480f2cfb..d857581c 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -114,7 +114,7 @@ if [ "`/sbin/consoletype`" == "vt" ]; then
if [ -f /etc/sysconfig/keyboard ]; then
. /etc/sysconfig/keyboard
fi
- if [ -n "$KEYTABLE" -a -d "/usr/lib/kbd/keymaps" ]; then
+ if [ -n "$KEYTABLE" -a -d "/usr/lib/kbd/keymaps" -o -d "/lib/kbd/keymaps" ]; then
KEYMAP=$KEYTABLE
fi
fi
@@ -137,7 +137,9 @@ if [ "`/sbin/consoletype`" == "vt" ]; then
if [ -f /etc/sysconfig/console/$SYSFONT.psf.gz -o \
-f /usr/lib/kbd/consolefonts/$SYSFONT.psf.gz -o \
-f /etc/sysconfig/console/$SYSFONT.gz -o \
- -f /usr/lib/kbd/consolefonts/$SYSFONT.gz ]; then
+ -f /usr/lib/kbd/consolefonts/$SYSFONT.gz -o \
+ -f /lib/kbd/consolefonts/$SYSFONT.gz -o \
+ -f /lib/kbd/consolefonts/$SYSFONT.psf.gz ]; then
action $"Setting default font ($SYSFONT): " /sbin/setsysfont
fi
fi