aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-11-04 11:18:12 -0500
committerHarald Hoyer <harald@redhat.com>2008-11-10 19:05:37 +0100
commitdcdabd7fb5f3c14b618195ae6ae4bf90819f5512 (patch)
tree67c95258dd5eb1dbe907f8dfe67369f9faed368b
parenta12d2efb0a2f8082f97d3a9b0a7c38a737aa8bec (diff)
downloadinitscripts-dcdabd7fb5f3c14b618195ae6ae4bf90819f5512.tar
initscripts-dcdabd7fb5f3c14b618195ae6ae4bf90819f5512.tar.gz
initscripts-dcdabd7fb5f3c14b618195ae6ae4bf90819f5512.tar.bz2
initscripts-dcdabd7fb5f3c14b618195ae6ae4bf90819f5512.tar.xz
initscripts-dcdabd7fb5f3c14b618195ae6ae4bf90819f5512.zip
Don't mkswap on halt (#469823)
Doing so blows away any label or UUID on the partition, which makes specifying encrypted swap by label or UUID fail miserably.
-rwxr-xr-xrc.d/init.d/halt2
1 files changed, 0 insertions, 2 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index 3242491a..81fcf971 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -146,8 +146,6 @@ if [ -n "$SWAPS" ]; then
backdev=$(/sbin/cryptsetup status "$dst" \
| awk '$1 == "device:" { print $2 }')
/sbin/cryptsetup remove "$dst"
- # Leave partition with a blank plain-text swap
- mkswap "$backdev" > /dev/null
fi
done
fi