diff options
Diffstat (limited to 'rc.d/init.d')
| -rwxr-xr-x | rc.d/init.d/functions | 5 | ||||
| -rwxr-xr-x | rc.d/init.d/network | 10 |
2 files changed, 11 insertions, 4 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 |