From owner-trustedbsd-cvs@FreeBSD.ORG  Wed Mar  8 21:06:00 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 77C6B16A422
	for <trustedbsd-cvs@freebsd.org>; Wed,  8 Mar 2006 21:06:00 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3B89A43D78
	for <trustedbsd-cvs@freebsd.org>; Wed,  8 Mar 2006 21:05:31 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id EE81046BA3
	for <trustedbsd-cvs@trustedbsd.org>;
	Wed,  8 Mar 2006 16:05:07 -0500 (EST)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id 6DDDD58088;
	Wed,  8 Mar 2006 21:05:28 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 53A5616A425; Wed,  8 Mar 2006 21:05:28 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8D58816A423
	for <perforce@freebsd.org>; Wed,  8 Mar 2006 21:05:27 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E387D43D66
	for <perforce@freebsd.org>; Wed,  8 Mar 2006 21:05:12 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k28L51ps040686
	for <perforce@freebsd.org>; Wed, 8 Mar 2006 21:05:01 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28L50ht040673
	for perforce@freebsd.org; Wed, 8 Mar 2006 21:05:00 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 8 Mar 2006 21:05:00 GMT
Message-Id: <200603082105.k28L50ht040673@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 92984 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Mar 2006 21:06:00 -0000

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

Change 92984 by rwatson@rwatson_peppercorn on 2006/03/08 21:04:44

	Re-enable old UFS mount code for the time being, as the lmount()
	changes are not currently good.

Affected files ...

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

Differences ...

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

@@ -469,6 +469,17 @@
 		free(optbuf);
 		return (1);
 	case 0:					/* Child. */
+		/*
+		 * XXXRW: In the new world order, nmount() is also used for
+		 * UFS.  With the SEBSD-local lmount changes, the following
+		 * block of code was not used, as mount_ufs contained
+		 * special support.
+		 */
+#if 1
+		if (strcmp(vfstype, "ufs") == 0)
+			exit(mount_ufs(argc, (char * const *) argv));
+#endif
+
 		/* Go find an executable. */
 		execvP(execname, _PATH_SYSPATH, (char * const *)argv);
 		if (errno == ENOENT) {