init:remove get_part_type function

The cryptsetup utility contains a 'isLuks' command which makes this
function uneeded. Updated call to this function with the cryptsetup
directive.

1 files changed, 1 insertions, 20 deletions

diff --git a/init b/init
index e075862..d1e6f57 100755
--- a/init
+++ b/init
@@ -84,25 +84,6 @@ parse_cmdline() {
   done
 }
 
- 
-#
-# Returns type of partition. If part is LUKS encrypted, returns 'luks'. If
-# anything else, returns 'fs'.
-#
-# Most installations of the mount command don't require specification of the
-# filesystem, but won't automatically detect luks partitions and prompt for a
-# password. This allows the script to be smarter about encrypted partitions.
-#
-get_part_type() {
-  local path="${1}"
-  local typestr="$(blkid -s TYPE ${path})"
-  if [ "$(echo ${typestr} | grep 'crypto_LUKS')" ]; then
-    echo 'luks'
-  else
-    echo 'fs'
-  fi
-}
-
 
 #
 # Takes an encrypted device path and executes cryptsetup luksOpen. Returns path
@@ -201,7 +182,7 @@ main() {
     /bin/bash -i
   fi
 
-  if [ "$(get_part_type ${ROOTDEV})" == 'luks' ]; then
+  if cryptsetup isLuks "${ROOTDEV}"; then
     # Set new rootdev location (/dev/mapper/something). This will update it to
     # the decrypted block device path.
     log "Root device ${ROOTDEV} is encrypted."