diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-08-29 17:45:42 -0400 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2009-05-04 16:05:05 +0200 |
| commit | 8ec4c4d51e6c92f15bab9436ac7fb275df3d7026 (patch) | |
| tree | 20243dadd766cc0b2b17c999c7a1d1967bb26657 | |
| parent | 79a6d07f0dfc21d3ce7ebdf6fc12ecf2ea2d4b07 (diff) | |
| download | initscripts-8ec4c4d51e6c92f15bab9436ac7fb275df3d7026.tar initscripts-8ec4c4d51e6c92f15bab9436ac7fb275df3d7026.tar.gz initscripts-8ec4c4d51e6c92f15bab9436ac7fb275df3d7026.tar.bz2 initscripts-8ec4c4d51e6c92f15bab9436ac7fb275df3d7026.tar.xz initscripts-8ec4c4d51e6c92f15bab9436ac7fb275df3d7026.zip | |
Don't say that we're shutting off crypto if we aren't actually doing it. (#471944)
| -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 81fcf971..04ff6626 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -31,7 +31,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 @@ -173,8 +173,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 |