summaryrefslogtreecommitdiff
path: root/sbin/mount_msdos
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2012-07-08 14:31:00 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2012-07-08 14:31:00 +0000
commit887908b79c7ae681e8b2bb02279240af317262d5 (patch)
treeb7308c555d181eef75bcf31c0d747e006d2dd458 /sbin/mount_msdos
parentb87977228a6f6a5a391c69fdfb2dc717d206ece4 (diff)
Return EROFS when a read-write mount of a read-only sd(4) device
is attempted. This is instead of the current EACCES and is intended to result in better error messages from mount(8). Tweak default EROFS error text to mention fsck'ing in mount_ext2fs and mount_msdos since they both have fsck's like ffs. ok deraadt@ aja@ ian@ phessler@
Diffstat (limited to 'sbin/mount_msdos')
-rw-r--r--sbin/mount_msdos/mount_msdos.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c
index 8e2aa0f3ce5..a3c1aa913e4 100644
--- a/sbin/mount_msdos/mount_msdos.c
+++ b/sbin/mount_msdos/mount_msdos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_msdos.c,v 1.24 2011/04/04 13:49:48 tedu Exp $ */
+/* $OpenBSD: mount_msdos.c,v 1.25 2012/07/08 14:30:58 krw Exp $ */
/* $NetBSD: mount_msdos.c,v 1.16 1996/10/24 00:12:50 cgd Exp $ */
/*
@@ -140,6 +140,10 @@ main(int argc, char **argv)
case EMFILE:
errcause = "mount table full";
break;
+ case EROFS:
+ errcause =
+ "filesystem must be mounted read-only; you may need to run fsck";
+ break;
case EINVAL:
errcause =
"not an MSDOS filesystem";