about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJuan RP <xtraeme@gmail.com>2015-03-22 07:07:04 +0100
committerJuan RP <xtraeme@gmail.com>2015-03-22 07:07:04 +0100
commit22d922a8d2cf0c81e85c18b7709487e41cbb6c4d (patch)
treed98febc11d952b1dd840306d2f93afb020853415
parentcc241733778444a9b4bbef9606a4eb2bab743a00 (diff)
parent15350c6482722f628673af164958d42f7b8ecd79 (diff)
downloadrunit-void-22d922a8d2cf0c81e85c18b7709487e41cbb6c4d.tar.gz
runit-void-22d922a8d2cf0c81e85c18b7709487e41cbb6c4d.tar.xz
runit-void-22d922a8d2cf0c81e85c18b7709487e41cbb6c4d.zip
Merge pull request #25 from nmeum/crypttab
Remove fallback /etc/crypttab parsing code
-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"