From 7694168a7cc81378055c7b70156def139ec15ee9 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 11 Dec 2015 09:54:08 +0000 Subject: [PATCH] Revert "work around busybox blkid" now we have upstream blkid This reverts commit 6f8ecb38f103fd0efa9151c5c24b8246341aecc7. --- alpine/etc/init.d/automount | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpine/etc/init.d/automount b/alpine/etc/init.d/automount index 5928dd5ed..853ecc922 100755 --- a/alpine/etc/init.d/automount +++ b/alpine/etc/init.d/automount @@ -12,7 +12,7 @@ MAGIC="boot2docker, please format-me" # If there is a partition with `boot2docker-data` as its label, use it and be # very happy. Thus, you can come along if you feel like a room without a roof. -BOOT2DOCKER_DATA=`blkid | grep -e "LABEL=\"$LABEL\"" | head -n 1 | sed 's/:.*//'` +BOOT2DOCKER_DATA=`blkid -o device -l -t LABEL=$LABEL` echo $BOOT2DOCKER_DATA if [ ! -n "$BOOT2DOCKER_DATA" ]; then echo "Is the disk unpartitioned?, test for the 'boot2docker format-me' string"