From owner-p4-projects Fri Oct 18 13:42:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 716A237B404; Fri, 18 Oct 2002 13:42:29 -0700 (PDT) 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 C6FC437B401 for ; Fri, 18 Oct 2002 13:42:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40CD943E7B for ; Fri, 18 Oct 2002 13:42:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9IKgDmV081564 for ; Fri, 18 Oct 2002 13:42:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9IKgC2V081558 for perforce@freebsd.org; Fri, 18 Oct 2002 13:42:12 -0700 (PDT) Date: Fri, 18 Oct 2002 13:42:12 -0700 (PDT) Message-Id: <200210182042.g9IKgC2V081558@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 Subject: PERFORCE change 19578 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19578 Change 19578 by rwatson@rwatson_tislabs on 2002/10/18 13:41:31 Selectively integ changes from the main tree: teach tunefs about proper sort orders, printing out new file system flags, etc. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/tunefs/tunefs.8#12 integrate .. //depot/projects/trustedbsd/mac/sbin/tunefs/tunefs.c#9 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sbin/tunefs/tunefs.8#12 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)tunefs.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.28 2002/10/14 19:52:12 rwatson Exp $ +.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.29 2002/10/15 15:30:55 rwatson Exp $ .\" .Dd May 18, 2002 .Dt TUNEFS 8 @@ -40,11 +40,11 @@ .Nd tune up an existing file system .Sh SYNOPSIS .Nm +.Op Fl A .Op Fl a Cm enable | disable -.Op Fl A .Op Fl e Ar maxbpg .Op Fl f Ar avgfilesize -.Op Fl l Ar enable | disable +.Op Fl l Cm enable | disable .Op Fl m Ar minfree .Op Fl n Cm enable | disable .Op Fl o Cm space | time @@ -65,14 +65,14 @@ The parameters which are to be changed are indicated by the flags given below: .Bl -tag -width indent -.It Fl a Cm enable | disable -Turn on/off the administrative ACL enable flag. .It Fl A The file system has several backups of the super-block. Specifying this option will cause all backups to be modified as well as the primary super-block. This is potentially dangerous - use with caution. +.It Fl a Cm enable | disable +Turn on/off the administrative ACL enable flag. .It Fl e Ar maxbpg Indicate the maximum number of blocks any single file can allocate out of a cylinder group before it is forced to begin ==== //depot/projects/trustedbsd/mac/sbin/tunefs/tunefs.c#9 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)tunefs.c 8.2 (Berkeley) 4/19/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.28 2002/10/14 19:52:12 rwatson Exp $"; + "$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.32 2002/10/16 05:03:40 rwatson Exp $"; #endif /* not lint */ /* @@ -109,8 +109,12 @@ if (argc < 3) usage(); found_arg = 0; /* at least one arg is required */ - while ((ch = getopt(argc, argv, "a:Ae:f:l:m:n:o:ps:")) != -1) + while ((ch = getopt(argc, argv, "Aa:e:f:l:m:n:o:ps:")) != -1) switch (ch) { + case 'A': + found_arg = 1; + Aflag++; + break; case 'a': found_arg = 1; name = "ACLs"; @@ -121,10 +125,6 @@ } aflag = 1; break; - case 'A': - found_arg = 1; - Aflag++; - break; case 'e': found_arg = 1; name = "maximum blocks per file in a cylinder group"; @@ -249,7 +249,7 @@ name); } else { sblock.fs_flags &= ~FS_ACLS; - warnx("%s set", name); + warnx("%s cleared", name); } } } @@ -291,7 +291,7 @@ name); } else { sblock.fs_flags &= ~FS_MULTILABEL; - warnx("%s set", name); + warnx("%s cleared", name); } } } @@ -377,7 +377,7 @@ usage() { fprintf(stderr, "%s\n%s\n%s\n", -"usage: tunefs [-a enable | disable] [-A] [-e maxbpg] [-f avgfilesize]", +"usage: tunefs [-A] [-a enable | disable] [-e maxbpg] [-f avgfilesize]", " [-l enable | disable] [-m minfree] [-n enable | disable]", " [-o space | time] [-p] [-s avgfpdir] special | filesystem"); exit(2); @@ -444,6 +444,10 @@ void printfs() { + warnx("ACLs: (-a) %s", + (sblock.fs_flags & FS_ACLS)? "enabled" : "disabled"); + warnx("MAC multilabel: (-l) %s", + (sblock.fs_flags & FS_MULTILABEL)? "enabled" : "disabled"); warnx("soft updates: (-n) %s", (sblock.fs_flags & FS_DOSOFTDEP)? "enabled" : "disabled"); warnx("maximum blocks per file in a cylinder group: (-e) %d", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message