From owner-trustedbsd-cvs@FreeBSD.ORG Thu Mar 9 01:29:46 2006 Return-Path: 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 4557E16A420 for ; Thu, 9 Mar 2006 01:29:46 +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 47F1243D75 for ; Thu, 9 Mar 2006 01:29:35 +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 4F03646C0E for ; Wed, 8 Mar 2006 20:29:13 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 618A358FE6; Thu, 9 Mar 2006 01:29:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F3BB16A423; Thu, 9 Mar 2006 01:29:16 +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 27D2D16A420 for ; Thu, 9 Mar 2006 01:29:16 +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 07DFD43D4C for ; Thu, 9 Mar 2006 01:29:15 +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 k291TEj8002351 for ; Thu, 9 Mar 2006 01:29:14 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 k291TE8J002345 for perforce@freebsd.org; Thu, 9 Mar 2006 01:29:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 01:29:14 GMT Message-Id: <200603090129.k291TE8J002345@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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 93008 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2006 01:29:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=93008 Change 93008 by rwatson@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);