github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-27 12:38:11 +00:00
Code Issues Projects Releases Wiki Activity

more liberal check for block devices

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-05-06 23:04:13 +01:00
parent 375439e2f9
commit 39e53686c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
alpine/packages/automount/etc/init.d/automount
View File

@ -10,7 +10,7 @@ start()
{ {
ebegin "Configuring host block device" ebegin "Configuring host block device"
DEV="$(ls /dev/[sxv]da | head -1 | sed s@/dev/@@)" DEV="$(lsblk -r | grep ' disk $' | awk '{print $1}' | head -1 )"
[ -z ${DEV} ] && exit 1 [ -z ${DEV} ] && exit 1
@ -35,7 +35,7 @@ start()
[ -d /var/var/lib/boot2docker/ ] && mount --bind /var/var /var [ -d /var/var/lib/boot2docker/ ] && mount --bind /var/var /var
fi fi
mount | grep -q '/dev/[sxv]da. on /var type' mount | grep -q "${DEV}. on /var type"
eend $? "Failed to mount block device" eend $? "Failed to mount block device"
} }