Now that the kernel is able to load modules itself,

remove all the code which was trying to do so.
This code was nasty in several ways, it was hiding
the kernel bug where the kernel was unable to properly
load a module, and it was quitting if it wasn't able
to load the module.  The consequence is that an ABI
breakage of the vfsconf API would have broken *every*
mount utility.

1 files changed, 1 insertions, 12 deletions

diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index dff7ac8..09be846 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -90,7 +90,6 @@ main(int argc, char **argv)
 	struct iso_args args;
 	int ch, mntflags, opts;
 	char *dev, *dir, mntpath[MAXPATHLEN];
-	struct vfsconf vfc;
 	int error, verbose;
 
 	mntflags = opts = verbose = 0;
@@ -172,17 +171,7 @@ main(int argc, char **argv)
 			printf("using starting sector %d\n", args.ssector);
 	}
 
-	error = getvfsbyname("cd9660", &vfc);
-	if (error && vfsisloadable("cd9660")) {
-		if (vfsload("cd9660"))
-			err(EX_OSERR, "vfsload(cd9660)");
-		endvfsent();	/* flush cache */
-		error = getvfsbyname("cd9660", &vfc);
-	}
-	if (error)
-		errx(1, "cd9660 filesystem is not available");
-
-	if (mount(vfc.vfc_name, mntpath, mntflags, &args) < 0)
+	if (mount("cd9660", mntpath, mntflags, &args) < 0)
 		err(1, "%s", args.fspec);
 	exit(0);
 }