summary refs log tree commit diff
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2015-03-21 23:19:59 +0100
committerSören Tempel <soeren+git@soeren-tempel.net>2015-03-21 23:23:01 +0100
commit15350c6482722f628673af164958d42f7b8ecd79 (patch)
tree10ee7d22599365fc6c87887cee7b6402a7ecf5d1
parente738582e8713aa2f0b6a9c3a4ad34c4a9d482ba2 (diff)
downloadrunit-void-15350c6482722f628673af164958d42f7b8ecd79.tar.gz
runit-void-15350c6482722f628673af164958d42f7b8ecd79.tar.xz
runit-void-15350c6482722f628673af164958d42f7b8ecd79.zip
Remove fallback /etc/crypttab parsing code
If /etc/runit/crypt.awk doesn't exist then somebody obviously fucked up
his runit-void installation because that file is installed by default.
-rw-r--r--core-services/03-filesystems.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/core-services/03-filesystems.sh b/core-services/03-filesystems.sh
index fa1af38..8b1e16b 100644
--- a/core-services/03-filesystems.sh
+++ b/core-services/03-filesystems.sh
@@ -22,13 +22,7 @@ fi
 
 if [ -e /etc/crypttab ]; then
     msg "Activating encrypted devices...\n"
-    if [ -e /etc/runit/crypt.awk ]; then
-        awk -f /etc/runit/crypt.awk /etc/crypttab
-    else
-        awk '/^#/ || /^$/ { next }
-           NF>2 { print "unsupported crypttab: " $0 >"/dev/stderr"; next}
-           { system("cryptsetup luksOpen " $2 " " $1) }' /etc/crypttab
-    fi
+    awk -f /etc/runit/crypt.awk /etc/crypttab
 
     if [ -x /sbin/vgchange ]; then
         msg "Activating LVM devices for dm-crypt...\n"