From 82de19bee10d24737eca3b3ada1dd5863f492442 Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Fri, 23 Dec 2016 10:13:23 +0100 Subject: disk: Check for ENOMEDIUM when partition is required --- src/disk.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/disk.c b/src/disk.c index 8a16ca3..63f7a52 100644 --- a/src/disk.c +++ b/src/disk.c @@ -131,8 +131,18 @@ int disk_open_dev(int maj, int min, int partition, int readonly) { if ( stat(blkdev, &st) != 0 || ! S_ISBLK(st.st_mode) ) { memcpy(blkdev+len, "1", 2); if ( stat(blkdev, &st) != 0 || ! S_ISBLK(st.st_mode) ) { - ERROR("Block device has partitions"); - return -1; + blkdev[len] = 0; + fd = open(blkdev, O_RDONLY); + if ( fd < 0 ) { + if ( errno != ENOMEDIUM ) { + ERROR_INFO("Cannot open block device %s", blkdev); + return -1; + } + } else { + close(fd); + ERROR("Block device does not have partitions"); + return -1; + } } } -- cgit v1.2.3