From f87aef85d35878ba5886e739dffa84068198f0c0 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 29 Aug 2008 17:45:42 -0400
Subject: Don't say that we're shutting off crypto if we aren't actually doing
 it.

---
 rc.d/init.d/halt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'rc.d/init.d')

diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index ea973017..fc9a6f27 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -28,7 +28,7 @@ halt_crypto() {
 	[ -z "$dst" -o "${dst#\#}" != "$dst" ] && continue
         if [ -b "/dev/mapper/$dst" ]; then
             if /sbin/dmsetup info "$dst" | grep -q '^Open count: *0$'; then
-                /sbin/cryptsetup remove "$dst"
+                action $"Stopping disk encryption for $dst" /sbin/cryptsetup remove "$dst"
             else
                 fnval=1
             fi
@@ -129,8 +129,7 @@ LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/dev/{next}
 
 [ -f /proc/bus/usb/devices ] && umount /proc/bus/usb
 
-[ -f /etc/crypttab ] && \
-    LANG=C action $"Stopping disk encryption: " halt_crypto
+[ -f /etc/crypttab ] && halt_crypto
 
 # remove the crash indicator flag
 rm -f /.autofsck
-- 
cgit v1.2.1