From owner-p4-projects@FreeBSD.ORG  Sat Jul  9 21:26:37 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0663616A420; Sat,  9 Jul 2005 21:26:37 +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 CDBFD16A41C
	for <perforce@freebsd.org>; Sat,  9 Jul 2005 21:26:36 +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 9C82043D48
	for <perforce@freebsd.org>; Sat,  9 Jul 2005 21:26:36 +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 j69LQa49095774
	for <perforce@freebsd.org>; Sat, 9 Jul 2005 21:26:36 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 j69LQak7095771
	for perforce@freebsd.org; Sat, 9 Jul 2005 21:26:36 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 9 Jul 2005 21:26:36 GMT
Message-Id: <200507092126.j69LQak7095771@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 79865 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Jul 2005 21:26:37 -0000

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

Change 79865 by rwatson@rwatson_zoo on 2005/07/09 21:25:36

	Don't use internal UFS mount support, prefer mount_ufs(8), which
	uses nmount(2).
	
	Pass -l 'label' down to the real mount implementation if it was
	passed to mount(8).

Affected files ...

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

Differences ...

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

@@ -449,6 +449,10 @@
 	mangle(optbuf, &argc, argv);
 	argv[argc++] = spec;
 	argv[argc++] = name;
+	if (ltext != NULL) {
+		argv[argc++] = "-l";
+		argv[argc++] = ltext;
+	}
 	argv[argc] = NULL;
 
 	if (debug) {
@@ -465,9 +469,6 @@
 		free(optbuf);
 		return (1);
 	case 0:					/* Child. */
-		if (strcmp(vfstype, "ufs") == 0)
-			exit(mount_ufs(argc, (char * const *) argv, ltext));
-
 		/* Go find an executable. */
 		execvP(execname, _PATH_SYSPATH, (char * const *)argv);
 		if (errno == ENOENT) {