diff options
| author | Bill Nottingham <notting@redhat.com> | 2001-02-07 20:27:58 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2001-02-07 20:27:58 +0000 |
| commit | 86b8d597ab7936b5fa5b2098f1b564c1b3e18908 (patch) | |
| tree | 1dba7a1950da0703f5da191a99c88e9da0cfa8e0 | |
| parent | d3f65d9cfb5c2aa2ead5f1b2f25b81a57f32a8ce (diff) | |
| download | initscripts-86b8d597ab7936b5fa5b2098f1b564c1b3e18908.tar initscripts-86b8d597ab7936b5fa5b2098f1b564c1b3e18908.tar.gz initscripts-86b8d597ab7936b5fa5b2098f1b564c1b3e18908.tar.bz2 initscripts-86b8d597ab7936b5fa5b2098f1b564c1b3e18908.tar.xz initscripts-86b8d597ab7936b5fa5b2098f1b564c1b3e18908.zip | |
fix the 'unable to shutdown cleanly' problem (#25744)
| -rwxr-xr-x | rc.d/init.d/functions | 2 | ||||
| -rwxr-xr-x | rc.d/init.d/halt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 65c10ddf..8d055bc4 100755 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -20,7 +20,7 @@ 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 +if [ -f /etc/sysconfig/i18n -a -z "$NOLOCALE" ] ; then . /etc/sysconfig/i18n if [ "$LANG" = "ja_JP.eucJP" -a "`/sbin/consoletype`" != "pty" ]; then unset LANG diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index 4f9eedb1..b5a626b0 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -11,6 +11,7 @@ # Set the path. PATH=/sbin:/bin:/usr/bin:/usr/sbin +export NOLOCALE=1 . /etc/init.d/functions runcmd() { |