MFC: Provide userland interface for broken Joilet disks.

Approved by:	jkh

2 files changed, 12 insertions, 2 deletions

diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 4e2a6f827f85..ef98b63197d6 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -44,7 +44,7 @@
 .Nd mount an ISO-9660 filesystem
 .Sh SYNOPSIS
 .Nm
-.Op Fl egjrv
+.Op Fl begjrv
 .Op Fl o Ar options
 .Op Fl s Ar startsector
 .Ar special | node
@@ -61,6 +61,9 @@ at boot time.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
+.It Fl b
+Relax checking for Supplementary Volume Descriptor Flags field
+which is set to a wrong value on some Joliet formatted disks.
 .It Fl e
 Enable the use of extended attributes.
 .It Fl g
@@ -92,6 +95,9 @@ Same as
 .It rrip
 Same as
 .Fl r .
+.It strictjoliet
+Same as
+.Fl b .
 .El
 .It Fl r
 Do not use any Rockridge extensions included in the filesystem.
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 9face8293afe..3ea3d39dd0d5 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -75,6 +75,7 @@ struct mntopt mopts[] = {
 	{ "gens", 0, ISOFSMNT_GENS, 1 },
 	{ "rrip", 1, ISOFSMNT_NORRIP, 1 },
 	{ "joliet", 1, ISOFSMNT_NOJOLIET, 1 },
+	{ "strictjoliet", 1, ISOFSMNT_BROKENJOLIET, 1 },
 	{ NULL }
 };
 
@@ -93,8 +94,11 @@ main(int argc, char **argv)
 	mntflags = opts = verbose = 0;
 	memset(&args, 0, sizeof args);
 	args.ssector = -1;
-	while ((ch = getopt(argc, argv, "egjo:rs:v")) != -1)
+	while ((ch = getopt(argc, argv, "begjo:rs:v")) != -1)
 		switch (ch) {
+		case 'b':
+			opts |= ISOFSMNT_BROKENJOLIET;
+			break;
 		case 'e':
 			opts |= ISOFSMNT_EXTATT;
 			break;