Drop the defunct FDOPT_NOERRLOG option from all the floppy utilities.

The kernel does not log floppy media errors anymore.

In fdcontrol, do always open the file descriptor in read-only mode so
it can operate on read-only media, as there is no longer a separate
control device to operate on.

1 files changed, 1 insertions, 6 deletions

diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index 8e29e40..807ad8d 100644
--- a/usr.sbin/fdformat/fdformat.c
+++ b/usr.sbin/fdformat/fdformat.c
@@ -146,7 +146,7 @@ main(int argc, char **argv)
 	struct fdc_status fdcs[MAXPRINTERRS];
 	int format, fill, quiet, verify, verify_only, confirm;
 	int fd, c, i, track, error, tracks_per_dot, bytes_per_track, errs;
-	int fdopts, flags;
+	int flags;
 	char *fmtstring, *device;
 	const char *name, *descr;
 
@@ -250,11 +250,6 @@ main(int argc, char **argv)
 		errx(EX_OSERR, "not a floppy disk: %s", device);
 	if (ioctl(fd, FD_GDTYPE, &type) == -1)
 		err(EX_OSERR, "ioctl(FD_GDTYPE)");
-	if (ioctl(fd, FD_GOPTS, &fdopts) == -1)
-		err(EX_OSERR, "ioctl(FD_GOPTS)");
-	fdopts |= FDOPT_NOERRLOG;
-	if (ioctl(fd, FD_SOPTS, &fdopts) == -1)
-		err(EX_OSERR, "ioctl(FD_SOPTS, FDOPT_NOERRLOG)");
 	if (format) {
 		getname(type, &name, &descr);
 		fdtp = get_fmt(format, type);