From 15350c6482722f628673af164958d42f7b8ecd79 Mon Sep 17 00:00:00 2001
From: Sören Tempel <soeren+git@soeren-tempel.net>
Date: Sat, 21 Mar 2015 23:19:59 +0100
Subject: 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.
---
 core-services/03-filesystems.sh | 8 +-------
 1 file changed, 1 insertion(+), 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"
-- 
cgit 1.4.1