Use blkid to grab config drive fs type

This simplifies our code to grab the fs type. The real motivation,
though, is we are seeing the existing code fail to return the fs type
occasionally. This appears to be another 'we run too early' bug. There
is a previous blkid command which obtains the fs type successfully,
though, and this appears to consistently work, so lets use that command
instead.

Change-Id: I7f50daa2696300686ae4315f19e23a22492dc049
This commit is contained in:
Gregory Haynes 2016-06-29 15:21:30 +00:00 committed by greghaynes
parent 9a68df0df5
commit 4fb9fcb6a2
1 changed files with 1 additions and 1 deletions

View File

@ -47,7 +47,7 @@ if blkid -t LABEL="config-2" ; then
# Mount config drive
mkdir -p /mnt/config
BLOCKDEV="$(blkid -L config-2)"
TYPE="$(blkid ${BLOCKDEV} -o udev | grep FS_TYPE | cut -d '=' -f 2)"
TYPE="$(blkid -t LABEL=config-2 -s TYPE -o value)"
if [[ "${TYPE}" == 'vfat' ]]; then
mount -o umask=0077 "${BLOCKDEV}" /mnt/config || true
else