fix inability to shutdown cleanly

3 files changed, 9 insertions, 3 deletions

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 0ec784b6..86d1c3c0 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -22,7 +22,7 @@ export PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"
 
 if [ -f /etc/sysconfig/i18n ] ; then
   . /etc/sysconfig/i18n
-  LC_MESSAGES=$LANG
+  export LANG
 fi
 
 # Read in our configuration
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index 792e17b1..06721332 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -116,9 +116,9 @@ remaining=`awk '!/(^#|proc|loopfs|^none|^\/dev\/root| \/ )/ {print $2}' /proc/mo
 while [ -n "$remaining" -a "$retry" -gt 0 ]
 do
 	if [ "$retry" -lt 3 ]; then
-		runcmd $"Unmounting file systems (retry): "  umount -a -f -t noproc
+		LANG=C runcmd $"Unmounting file systems (retry): "  umount -a -f -t noproc
 	else
-		runcmd $"Unmounting file systems: "  umount -a -f -t noproc
+		LANG=C runcmd $"Unmounting file systems: "  umount -a -f -t noproc
 	fi
 	sleep 2
 	remaining=`awk '!/(^#|proc|loopfs|^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts`
diff --git a/rc.d/rc b/rc.d/rc
index bd9ff7cc..87a124a8 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -101,6 +101,12 @@ if [ -d /etc/rc$runlevel.d ]; then
 			$i start
 		else
 			if [ "$subsys" = "halt" -o "$subsys" = "reboot" -o "$subsys" = "single" -o "$subsys" = "local" ]; then
+			    if [ "$subsys" = "halt" -o "$subsys" = "reboot" ]; then
+				unset LANG
+				unset TEXTDOMAIN
+				unset TEXTDOMAINDIR
+				exec $i start
+			    fi
 			    $i start
 			else
 			    action $"Starting $subsys: " $i start