aboutsummaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-02-19 20:06:26 -0500
committerTom Gundersen <teg@jklm.no>2012-03-17 11:16:11 +0100
commitcb1ddfc15431f2e6498c93cd4da53e14f1147659 (patch)
tree9dc2059c258eddb8884cbe8cb6c6d4d260a06247 /functions
parent28ec5b76ca5cbb53ec9d5de73749dbe76db7611a (diff)
downloadinitscripts-cb1ddfc15431f2e6498c93cd4da53e14f1147659.tar.xz
sysinit: remove cryptsetup compat
We haven't had the static binary in nearly 2 years, so simply call this without a PATH lookup. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Diffstat (limited to 'functions')
-rw-r--r--functions11
1 files changed, 0 insertions, 11 deletions
diff --git a/functions b/functions
index 747e42d..129b3d4 100644
--- a/functions
+++ b/functions
@@ -379,17 +379,6 @@ activate_vgs() {
(( $? == 0 )) && stat_done || stat_fail
}
-# Arch cryptsetup packages traditionally contained the binaries
-# /usr/sbin/cryptsetup
-# /sbin/cryptsetup.static
-# By default, initscripts used the /sbin/cryptsetup.static.
-# Newer packages will only have /sbin/cryptsetup and no static binary
-# This ensures maximal compatibility with the old and new layout
-for CS in /sbin/cryptsetup /usr/sbin/cryptsetup \
- /sbin/cryptsetup.static ''; do
- [[ -x $CS ]] && break
-done
-
read_crypttab() {
# $1 = function to call with the split out line from the crypttab
local line nspo failed=0