PERFORCE change 93008 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=93008

Change 93008 by rwatson at rwatson_peppercorn on 2006/03/09 01:29:01

	Temporarily disable label handling in mount due to it not being
	quite ready for nmount().

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#14 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#14 (text+ko) ====

@@ -458,7 +458,7 @@
 
 int
 mountfs(const char *vfstype, const char *spec, const char *name, int flags,
-	const char *options, const char *mntopts)
+	const char *options, const char *mntopts, __unused const char *ltext)
 {
 	char *argv[100];
 	struct statfs sf;
@@ -500,11 +500,16 @@
 	mangle(optbuf, &argc, argv);
 	argv[argc++] = strdup(spec);
 	argv[argc++] = strdup(name);
+#if 0
+	/*
+	 * XXXRW: Temporarily disabled due to nmount conversion.
+	 */
 	if (ltext != NULL) {
 		argv[argc++] = "-l";
 		argv[argc++] = ltext;
 	}
 	argv[argc] = NULL;
+#endif
 
 	if (debug) {
 		(void)printf("exec: mount_%s", vfstype);
@@ -519,7 +524,6 @@
 	} else {
 		ret = mount_fs(vfstype, argc, argv); 
 	}
-#endif
 
 	free(optbuf);