diff options
| author | Bill Nottingham <notting@redhat.com> | 1999-07-07 15:28:55 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 1999-07-07 15:28:55 +0000 |
| commit | 77b0bb06a826bff3e745bc10d2aff30bef514fe8 (patch) | |
| tree | b53bf6cb38c6fff2d6528e62710dba0386c20b71 | |
| parent | a85467e47ddb766356552452059f883892ef92a4 (diff) | |
| download | initscripts-77b0bb06a826bff3e745bc10d2aff30bef514fe8.tar initscripts-77b0bb06a826bff3e745bc10d2aff30bef514fe8.tar.gz initscripts-77b0bb06a826bff3e745bc10d2aff30bef514fe8.tar.bz2 initscripts-77b0bb06a826bff3e745bc10d2aff30bef514fe8.tar.xz initscripts-77b0bb06a826bff3e745bc10d2aff30bef514fe8.zip | |
fixes from nkbj@image.dk
| -rw-r--r-- | adjtime | 1 | ||||
| -rwxr-xr-x | lang.sh | 35 | ||||
| -rwxr-xr-x | rc.d/init.d/network | 8 |
3 files changed, 9 insertions, 35 deletions
@@ -1 +1,2 @@ 0.0 0 0.0 +0 @@ -12,38 +12,7 @@ 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 - - if [ -n "$SYSFONTACM" ]; then - case $SYSFONTACM in - iso01*|iso02*|iso15*|koi*) - LESSCHARSET=latin1 - export LESSCHARSET INPUTRC - 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 - 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 "$INPUTRC" ] && export INPUTRC || unset INPUTRC + [ -n "$LESSCHARSET" ] && export LESSCHARSET || unset LESSCHARSET [ -n "$_XKB_CHARSET" ] && export _XKB_CHARSET || unset _XKB_CHARSET - - unset SYSFONTACM fi diff --git a/rc.d/init.d/network b/rc.d/init.d/network index cb3a9768..7ef76e96 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -107,8 +107,12 @@ case "$1" in ;; esac ./ifdown ifcfg-lo - action "Disabling IPv4 packet forwarding" /bin/true - echo 0 > /proc/sys/net/ipv4/ip_forward + if [ -d /proc/sys/net/ipv4 -a -f /proc/sys/net/ipv4/ip_forward ]; then + if [ `cat /proc/sys/net/ipv4/ip_forward` != 0 ]; then + action "Disabling IPv4 packet forwarding" /bin/true + echo 0 > /proc/sys/net/ipv4/ip_forward + fi + fi rm -f /var/lock/subsys/network ;; status) |