diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-08-29 17:45:42 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-08-29 17:45:42 -0400 |
| commit | f87aef85d35878ba5886e739dffa84068198f0c0 (patch) | |
| tree | 1bea0d46eb9dab7f678dd371bb87c9eed67b1581 | |
| parent | cfd2b6c8dffef09d9c4a56fa767c8391258d957d (diff) | |
| download | initscripts-f87aef85d35878ba5886e739dffa84068198f0c0.tar initscripts-f87aef85d35878ba5886e739dffa84068198f0c0.tar.gz initscripts-f87aef85d35878ba5886e739dffa84068198f0c0.tar.bz2 initscripts-f87aef85d35878ba5886e739dffa84068198f0c0.tar.xz initscripts-f87aef85d35878ba5886e739dffa84068198f0c0.zip | |
Don't say that we're shutting off crypto if we aren't actually doing it.
| -rwxr-xr-x | rc.d/init.d/halt | 5 |
1 files changed, 2 insertions, 3 deletions
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 |