summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2011-01-26 17:32:26 +0100
committerThomas Bächler <thomas@archlinux.org>2011-01-26 17:32:26 +0100
commit0e05f9fd91f8844f7a14ec42da889db831a086d9 (patch)
tree1fc51a8cd025dfec2583d72300aed57ff11ee061
parent6cfb498956013f69aa2d6004b235842be9c938bc (diff)
Fix isLuks check
The check was wrong, every device was treated as LUKS. Also remove the _isluks variable, as now it is not used by the SWAP sanity check anymore.
-rwxr-xr-xrc.sysinit4
1 files changed, 1 insertions, 3 deletions
diff --git a/rc.sysinit b/rc.sysinit
index f5c3e87..9550122 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -136,9 +136,7 @@ if [[ -f /etc/crypttab && $CS ]]; then
# Ordering of options is different if you are using LUKS vs. not.
# Use ugly swizzling to deal with it.
# isLuks only gives an exit code but no output to stdout or stderr.
- $CS isLuks "$2"
- _isluks=$?
- if [[ $_isluks ]]; then
+ if $CS isLuks "$2"; then
open=luksOpen
a="$2"
b="$1"