From e146ae4edb52b0559cbb42717338665c6395b56f Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 21 Mar 2014 14:04:59 +0100 Subject: libfdisk: properly implement read-only mode Don't use fallback to read-only mode in fdisk_context_assign_device(), it's application responsibility open the device in the right mode. The commands fdisk and cfdisk check (and report) read-only mode now. Reported-by: Maciej Małecki Signed-off-by: Karel Zak --- disk-utils/fdisk-menu.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'disk-utils/fdisk-menu.c') diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c index 822761568..bdaa73475 100644 --- a/disk-utils/fdisk-menu.c +++ b/disk-utils/fdisk-menu.c @@ -447,6 +447,10 @@ static int generic_menu_cb(struct fdisk_context **cxt0, list_disklabel(cxt); break; case 'w': + if (fdisk_context_is_readonly(cxt)) { + fdisk_warnx(cxt, _("Device open in read-only mode.")); + break; + } rc = fdisk_write_disklabel(cxt); if (rc) err(EXIT_FAILURE, _("failed to write disklabel")); -- cgit v1.2.3-55-g7522