PERFORCE change 40243 for review
Robert Watson
rwatson at FreeBSD.org
Thu Oct 23 02:33:45 GMT 2003
http://perforce.freebsd.org/chv.cgi?CH=40243
Change 40243 by rwatson at rwatson_paprika on 2003/10/22 19:32:48
Integrate trustedbsd_sebsd sbin tree forward to 39070, the
last major integration of the trustedbsd_mac branch, which brings
in many of the major changes in the last four months to the main
FreeBSD tree. This includes substantial lock pushdown, threading
bug fixes, compiler upgrades, et al.
Conditionalize building of ATM+IPv6+Vinum bits. Ffsinfo, growfs
fixed. DYNAMIC_ROOT support. ATAng.
Affected files ...
.. //depot/projects/trustedbsd/sebsd/sbin/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/atacontrol/atacontrol.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/atm/Makefile#3 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/atm/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atm/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atm/atm.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atmconfig/Makefile#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atmconfig/atmconfig.8#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atmconfig/atmconfig.h#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atmconfig/atmconfig.help#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atmconfig/diag.c#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atmconfig/diag.h#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atmconfig/main.c#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atmconfig/natm.c#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/atm/atmconfig/private.h#1 branch
.. //depot/projects/trustedbsd/sebsd/sbin/atm/fore_dnld/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/atm/ilmid/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/bsdlabel/bsdlabel.5#3 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/bsdlabel/bsdlabel.8#3 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/bsdlabel/bsdlabel.c#3 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/camcontrol/modeedit.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ccdconfig/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ccdconfig/ccdconfig.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/comcontrol/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/comcontrol/comcontrol.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/devd/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/devd/devd.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/devfs/devfs.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/dhclient/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/disklabel/disklabel.5#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/disklabel/disklabel.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/dump/optr.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ffsinfo/Makefile#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ffsinfo/ffsinfo.8#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ffsinfo/ffsinfo.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/fsdb/fsdb.8#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/growfs/debug.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/growfs/debug.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ifconfig/ifconfig.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ifconfig/ifconfig.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ifconfig/ifieee80211.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ip6fw/ip6fw.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ip6fw/ip6fw.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ipfw/ipfw.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ipfw/ipfw2.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mdconfig/mdconfig.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mksnap_ffs/mksnap_ffs.8#3 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount/mount.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_cd9660/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_cd9660/mount_cd9660.8#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_cd9660/mount_cd9660.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_hpfs/mount_hpfs.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_msdosfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_msdosfs/iso22dos#2 delete
.. //depot/projects/trustedbsd/sebsd/sbin/mount_msdosfs/iso72dos#2 delete
.. //depot/projects/trustedbsd/sebsd/sbin/mount_msdosfs/koi2dos#2 delete
.. //depot/projects/trustedbsd/sebsd/sbin/mount_msdosfs/koi8u2dos#2 delete
.. //depot/projects/trustedbsd/sebsd/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_nfs/mount_nfs.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_ntfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_ntfs/mount_ntfs.8#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/mount_ntfs/mount_ntfs.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/natd/natd.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/natd/natd.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/newfs/newfs.8#5 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/nfsiod/nfsiod.8#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/ping/ping.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/quotacheck/quotacheck.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/raidctl/raidctl.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/rcorder/rcorder.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/route/route.8#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/routed/defs.h#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/routed/trace.c#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/rtsol/Makefile#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/savecore/savecore.8#2 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/savecore/savecore.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/sysctl/sysctl.8#4 integrate
.. //depot/projects/trustedbsd/sebsd/sbin/vinum/vinum.8#4 integrate
Differences ...
==== //depot/projects/trustedbsd/sebsd/sbin/Makefile#4 (text+ko) ====
@@ -1,11 +1,10 @@
# @(#)Makefile 8.5 (Berkeley) 3/31/94
-# $FreeBSD: src/sbin/Makefile,v 1.124 2003/07/24 01:42:49 peter Exp $
+# $FreeBSD: src/sbin/Makefile,v 1.127 2003/08/29 10:35:00 phk Exp $
# XXX MISSING: icheck ncheck
SUBDIR= adjkerntz \
atacontrol \
- atm \
badsect \
bsdlabel \
camcontrol \
@@ -19,6 +18,7 @@
dump \
dumpfs \
dumpon \
+ ffsinfo \
fsck \
fsck_ffs \
fsck_msdosfs \
@@ -28,7 +28,6 @@
growfs \
ifconfig \
init \
- ip6fw \
ipfw \
kldconfig \
kldload \
@@ -58,7 +57,6 @@
nologin \
nos-tun \
ping \
- ping6 \
quotacheck \
raidctl \
rcorder \
@@ -79,8 +77,11 @@
swapon \
sysctl \
tunefs \
- umount \
- vinum
+ umount
+
+.if !defined(NOATM)
+SUBDIR+=atm
+.endif
.if !defined(NO_CXX)
SUBDIR+=devd
@@ -94,6 +95,15 @@
ipnat
.endif
+.if !defined(NOINET6)
+SUBDIR+=ip6fw \
+ ping6
+.endif
+
+.if !defined(NO_VINUM)
+SUBDIR+=vinum
+.endif
+
.if ${MACHINE_ARCH} == "i386"
SUBDIR+=cxconfig
.if ${MACHINE} == "pc98"
==== //depot/projects/trustedbsd/sebsd/sbin/Makefile.inc#2 (text+ko) ====
@@ -1,6 +1,9 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/8/93
-# $FreeBSD: src/sbin/Makefile.inc,v 1.8 2001/12/04 02:19:43 obrien Exp $
+# $FreeBSD: src/sbin/Makefile.inc,v 1.9 2003/08/17 08:37:47 gordon Exp $
BINDIR?= /sbin
+WARNS?= 2
+
+.if !defined (WITH_DYNAMICROOT)
NOSHARED?= YES
-WARNS?= 2
+.endif
==== //depot/projects/trustedbsd/sebsd/sbin/atacontrol/atacontrol.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.25 2003/05/05 10:28:37 sos Exp $
+ * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.26 2003/08/24 09:23:54 sos Exp $
*/
#include <sys/types.h>
@@ -55,6 +55,7 @@
case ATA_UDMA4: return "UDMA66";
case ATA_UDMA5: return "UDMA100";
case ATA_UDMA6: return "UDMA133";
+ case ATA_SA150: return "SATA150";
case ATA_DMA: return "BIOSDMA";
default: return "???";
}
@@ -130,66 +131,71 @@
printf("heads %d\n", parm->heads);
printf("sectors/track %d\n", parm->sectors);
- printf("lba%ssupported ", parm->support_lba ? " " : " not ");
+ printf("lba%ssupported ",
+ parm->capabilities1 & ATA_SUPPORT_LBA ? " " : " not ");
if (lbasize)
printf("%d sectors\n", lbasize);
else
printf("\n");
printf("lba48%ssupported ",
- parm->support.address48 ? " " : " not ");
+ parm->support.command2 & ATA_SUPPORT_ADDRESS48 ? " " : " not ");
if (lbasize48)
printf("%ju sectors\n", (uintmax_t)lbasize48);
else
printf("\n");
- printf("dma%ssupported\n", parm->support_dma ? " " : " not");
+ printf("dma%ssupported\n",
+ parm->capabilities1 & ATA_SUPPORT_DMA ? " " : " not");
- printf("overlap%ssupported\n", parm->support_queueing ? " " : " not ");
+ printf("overlap%ssupported\n",
+ parm->capabilities1 & ATA_SUPPORT_OVERLAP ? " " : " not ");
printf("\nFeature "
"Support Enable Value Vendor\n");
printf("write cache %s %s\n",
- parm->support.write_cache ? "yes" : "no",
- parm->enabled.write_cache ? "yes" : "no");
+ parm->support.command1 & ATA_SUPPORT_WRITECACHE ? "yes" : "no",
+ parm->enabled.command1 & ATA_SUPPORT_WRITECACHE ? "yes" : "no");
printf("read ahead %s %s\n",
- parm->support.look_ahead ? "yes" : "no",
- parm->enabled.look_ahead ? "yes" : "no");
+ parm->support.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no",
+ parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no");
- printf("dma queued %s %s %d/%02X\n",
- parm->support.queued ? "yes" : "no",
- parm->enabled.queued ? "yes" : "no",
- parm->queuelen, parm->queuelen);
+ printf("dma queued %s %s %d/0x%02X\n",
+ parm->support.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no",
+ parm->enabled.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no",
+ ATA_QUEUE_LEN(parm->queue), ATA_QUEUE_LEN(parm->queue));
printf("SMART %s %s\n",
- parm->support.smart ? "yes" : "no",
- parm->enabled.smart ? "yes" : "no");
+ parm->support.command1 & ATA_SUPPORT_SMART ? "yes" : "no",
+ parm->enabled.command1 & ATA_SUPPORT_SMART ? "yes" : "no");
printf("microcode download %s %s\n",
- parm->support.microcode ? "yes" : "no",
- parm->enabled.microcode ? "yes" : "no");
+ parm->support.command2 & ATA_SUPPORT_MICROCODE ? "yes" : "no",
+ parm->enabled.command2 & ATA_SUPPORT_MICROCODE ? "yes" : "no");
printf("security %s %s\n",
- parm->support.security ? "yes" : "no",
- parm->enabled.security ? "yes" : "no");
+ parm->support.command1 & ATA_SUPPORT_SECURITY ? "yes" : "no",
+ parm->enabled.command1 & ATA_SUPPORT_SECURITY ? "yes" : "no");
printf("power management %s %s\n",
- parm->support.power_mngt ? "yes" : "no",
- parm->enabled.power_mngt ? "yes" : "no");
+ parm->support.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no",
+ parm->enabled.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no");
- printf("advanced power management %s %s %d/%02X\n",
- parm->support.apm ? "yes" : "no",
- parm->enabled.apm ? "yes" : "no",
+ printf("advanced power management %s %s %d/0x%02X\n",
+ parm->support.command2 & ATA_SUPPORT_APM ? "yes" : "no",
+ parm->enabled.command2 & ATA_SUPPORT_APM ? "yes" : "no",
parm->apm_value, parm->apm_value);
printf("automatic acoustic management %s %s "
- "%d/%02X %d/%02X\n",
- parm->support.auto_acoustic ? "yes" : "no",
- parm->enabled.auto_acoustic ? "yes" : "no",
- parm->current_acoustic, parm->current_acoustic,
- parm->vendor_acoustic, parm->vendor_acoustic);
+ "%d/0x%02X %d/0x%02X\n",
+ parm->support.command2 & ATA_SUPPORT_AUTOACOUSTIC ? "yes" :"no",
+ parm->enabled.command2 & ATA_SUPPORT_AUTOACOUSTIC ? "yes" :"no",
+ ATA_ACOUSTIC_CURRENT(parm->acoustic),
+ ATA_ACOUSTIC_CURRENT(parm->acoustic),
+ ATA_ACOUSTIC_VENDOR(parm->acoustic),
+ ATA_ACOUSTIC_VENDOR(parm->acoustic));
}
int
@@ -203,7 +209,7 @@
bzero(&iocmd, sizeof(struct ata_cmd));
iocmd.channel = channel;
- iocmd.device = -1;
+ iocmd.device = device;
iocmd.cmd = ATAGPARM;
if (ioctl(fd, IOCATA, &iocmd) < 0)
==== //depot/projects/trustedbsd/sebsd/sbin/atm/Makefile#3 (text+ko) ====
@@ -20,9 +20,11 @@
# Copies of this Software may be made, however, the above copyright
# notice must be reproduced on all copies.
#
-# @(#) $FreeBSD: src/sbin/atm/Makefile,v 1.3 2003/08/03 15:17:27 obrien Exp $
+# @(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
+# $FreeBSD: src/sbin/atm/Makefile,v 1.5 2003/08/18 15:32:16 obrien Exp $
SUBDIR= atm \
+ atmconfig \
fore_dnld \
ilmid
==== //depot/projects/trustedbsd/sebsd/sbin/atm/Makefile.inc#3 (text+ko) ====
@@ -20,7 +20,7 @@
# Copies of this Software may be made, however, the above copyright
# notice must be reproduced on all copies.
#
-# @(#) $FreeBSD: src/sbin/atm/Makefile.inc,v 1.4 2003/08/03 15:17:27 obrien Exp $
-#
+# @(#) $Id: Makefile.inc,v 1.5 1998/07/10 16:01:58 jpt Exp $
+# $FreeBSD: src/sbin/atm/Makefile.inc,v 1.5 2003/08/18 15:32:16 obrien Exp $
.include "../Makefile.inc"
==== //depot/projects/trustedbsd/sebsd/sbin/atm/atm/Makefile#4 (text+ko) ====
@@ -20,8 +20,8 @@
# Copies of this Software may be made, however, the above copyright
# notice must be reproduced on all copies.
#
-# @(#) $FreeBSD: src/sbin/atm/atm/Makefile,v 1.9 2003/08/03 15:17:28 obrien Exp $
-#
+# @(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
+# $FreeBSD: src/sbin/atm/atm/Makefile,v 1.10 2003/08/18 15:32:16 obrien Exp $
PROG= atm
SRCS= atm.c atm_fore200.c atm_eni.c atm_inet.c atm_print.c \
==== //depot/projects/trustedbsd/sebsd/sbin/atm/atm/atm.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $FreeBSD: src/sbin/atm/atm/atm.c,v 1.8 2003/07/29 13:37:04 harti Exp $
+ * @(#) $FreeBSD: src/sbin/atm/atm/atm.c,v 1.9 2003/08/11 07:14:10 harti Exp $
*
*/
@@ -60,7 +60,7 @@
#include "atm.h"
#ifndef lint
-__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm.c,v 1.8 2003/07/29 13:37:04 harti Exp $");
+__RCSID("@(#) $FreeBSD: src/sbin/atm/atm/atm.c,v 1.9 2003/08/11 07:14:10 harti Exp $");
#endif
@@ -81,6 +81,7 @@
\n\
VC management subcommands:\n\
add pvc <intf> <vpi> <vci> <aal> <encaps> <owner> ...\n\
+ [UBR <pcr> | CBR <pcr> | VBR <pcr> <scr> <mbs>]\n\
delete pvc <intf> <vpi> <vci>\n\
delete svc <intf> <vpi> <vci>\n\
show stats vcc [<intf> [vpi [vci]]]\n\
@@ -536,7 +537,8 @@
*
* Command format:
* atm add PVC <interface_name> <vpi> <vci> <aal> <encaps>
- * <owner_name> [ubr <PCR> | cbr <PCR> | vbr <PCR> <SCR> <MBS>]
+ * <owner_name> ...owner info...
+ * [ubr <PCR> | cbr <PCR> | vbr <PCR> <SCR> <MBS>]
*
* Arguments:
* argc number of arguments to command
==== //depot/projects/trustedbsd/sebsd/sbin/atm/fore_dnld/Makefile#4 (text+ko) ====
@@ -20,8 +20,8 @@
# Copies of this Software may be made, however, the above copyright
# notice must be reproduced on all copies.
#
-# @(#) $FreeBSD: src/sbin/atm/fore_dnld/Makefile,v 1.10 2003/08/03 15:17:28 obrien Exp $
-#
+# @(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
+# $FreeBSD: src/sbin/atm/fore_dnld/Makefile,v 1.11 2003/08/18 15:32:16 obrien Exp $
PROG= fore_dnld
MAN= fore_dnld.8
==== //depot/projects/trustedbsd/sebsd/sbin/atm/ilmid/Makefile#4 (text+ko) ====
@@ -20,8 +20,8 @@
# Copies of this Software may be made, however, the above copyright
# notice must be reproduced on all copies.
#
-# @(#) $FreeBSD: src/sbin/atm/ilmid/Makefile,v 1.10 2003/08/03 15:17:28 obrien Exp $
-#
+# @(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
+# $FreeBSD: src/sbin/atm/ilmid/Makefile,v 1.11 2003/08/18 15:32:16 obrien Exp $
PROG= ilmid
MAN= ilmid.8
==== //depot/projects/trustedbsd/sebsd/sbin/bsdlabel/bsdlabel.5#3 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)disklabel.5.5 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.5,v 1.15 2002/12/12 17:25:54 ru Exp $
+.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.5,v 1.16 2003/09/10 19:24:34 ru Exp $
.\"
.Dd June 5, 1993
.Dt DISKLABEL 5
@@ -103,7 +103,7 @@
.Xr disklabel 8 .
.Pp
The format of the disk label, as specified in
-.Pa <sys/disklabel.h> ,
+.In sys/disklabel.h ,
is
.Bd -literal
#ifndef _SYS_DISKLABEL_H_
==== //depot/projects/trustedbsd/sebsd/sbin/bsdlabel/bsdlabel.8#3 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)disklabel.8 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.8,v 1.54 2003/05/24 19:53:08 ru Exp $
+.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.8,v 1.55 2003/09/08 19:57:18 ru Exp $
.\"
.Dd March 15, 2003
.Dt BSDLABEL 8
@@ -314,7 +314,7 @@
(See the definitions starting with
.Dv FS_UNUSED
in
-.Aq Pa sys/disklabel.h
+.In sys/disklabel.h
for more details.)
.It Ar fsize
For
==== //depot/projects/trustedbsd/sebsd/sbin/bsdlabel/bsdlabel.c#3 (text+ko) ====
@@ -53,7 +53,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.100 2003/06/07 22:02:01 phk Exp $");
+__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.101 2003/08/27 22:34:57 phk Exp $");
#include <sys/param.h>
#include <stdint.h>
@@ -1377,6 +1377,10 @@
strncpy(loclab.d_typename, "amnesiac",
sizeof(loclab.d_typename));
+ dp = &loclab.d_partitions[0];
+ dp->p_offset = BBSIZE / secsize;
+ dp->p_size = loclab.d_secperunit - dp->p_offset;
+
dp = &loclab.d_partitions[RAW_PART];
dp->p_size = loclab.d_secperunit;
loclab.d_checksum = dkcksum(&loclab);
==== //depot/projects/trustedbsd/sebsd/sbin/camcontrol/modeedit.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/camcontrol/modeedit.c,v 1.15 2003/08/05 09:19:07 johan Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/modeedit.c,v 1.16 2003/08/22 01:56:17 imp Exp $");
#include <sys/queue.h>
#include <sys/types.h>
@@ -133,7 +133,7 @@
#define RTRIM(string) do { \
- int _length; \
+ int _length; \
while (isspace(string[_length = strlen(string) - 1])) \
string[_length] = '\0'; \
} while (0)
==== //depot/projects/trustedbsd/sebsd/sbin/ccdconfig/Makefile#4 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/sbin/ccdconfig/Makefile,v 1.9 2003/06/02 20:50:59 phk Exp $
+# $FreeBSD: src/sbin/ccdconfig/Makefile,v 1.10 2003/08/07 19:10:35 johan Exp $
PROG= ccdconfig
-WARNS?= 3
+WARNS?= 6
MAN= ccdconfig.8
DPADD= ${LIBGEOM}
==== //depot/projects/trustedbsd/sebsd/sbin/ccdconfig/ccdconfig.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/ccdconfig/ccdconfig.c,v 1.33 2003/06/09 21:50:41 phk Exp $");
+__FBSDID("$FreeBSD: src/sbin/ccdconfig/ccdconfig.c,v 1.34 2003/08/07 19:10:35 johan Exp $");
#include <sys/param.h>
#include <sys/linker.h>
@@ -380,16 +380,16 @@
static int
dump_ccd(int argc, char **argv)
{
- int i, err;
+ int i, error;
if (argc == 0) {
- err = dumpout(-1);
+ error = dumpout(-1);
} else {
- err = 0;
- for (i = 0; err == 0 && i < argc; i++)
- err = dumpout(resolve_ccdname(argv[i]));
+ error = 0;
+ for (i = 0; error == 0 && i < argc; i++)
+ error = dumpout(resolve_ccdname(argv[i]));
}
- return (err);
+ return (error);
}
static int
==== //depot/projects/trustedbsd/sebsd/sbin/comcontrol/Makefile#4 (text+ko) ====
@@ -1,7 +1,8 @@
# @(#)Makefile 5.4 (Berkeley) 6/5/91
-# $FreeBSD: src/sbin/comcontrol/Makefile,v 1.6 2003/02/23 13:25:02 johan Exp $
+# $FreeBSD: src/sbin/comcontrol/Makefile,v 1.7 2003/08/08 19:51:01 johan Exp $
PROG= comcontrol
MAN= comcontrol.8
+WARNS?= 6
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sebsd/sbin/comcontrol/comcontrol.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/comcontrol/comcontrol.c,v 1.13 2003/05/03 18:41:56 obrien Exp $");
+__FBSDID("$FreeBSD: src/sbin/comcontrol/comcontrol.c,v 1.14 2003/08/08 19:51:01 johan Exp $");
#include <ctype.h>
#include <err.h>
@@ -40,6 +40,8 @@
#include <sys/types.h>
#include <sys/ioctl.h>
+static void usage(void);
+
static void
usage()
{
==== //depot/projects/trustedbsd/sebsd/sbin/devd/Makefile#4 (text+ko) ====
@@ -1,10 +1,12 @@
-# $FreeBSD: src/sbin/devd/Makefile,v 1.4 2003/04/01 11:11:38 ru Exp $
+# $FreeBSD: src/sbin/devd/Makefile,v 1.5 2003/08/17 08:40:49 gordon Exp $
PROG_CXX=devd
SRCS= devd.cc token.l parse.y y.tab.h
MAN= devd.8 devd.conf.5
WARNS?= 1
+NOSHARED?=YES
+
DPADD= ${LIBL}
LDADD= -ll
==== //depot/projects/trustedbsd/sebsd/sbin/devd/devd.8#4 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/devd/devd.8,v 1.9 2003/05/17 22:21:27 ru Exp $
+.\" $FreeBSD: src/sbin/devd/devd.8,v 1.10 2003/09/26 12:24:16 rse Exp $
.\"
.Dd October 17, 2002
.Dt DEVD 8
@@ -48,7 +48,7 @@
Run in the foreground instead of becoming a daemon.
.It Fl n
Do not process all pending events before becoming a daemon.
-Instaed, call daemon right away.
+Instead, call daemon right away.
.El
.Sh IMPLEMENTATION NOTES
The
==== //depot/projects/trustedbsd/sebsd/sbin/devfs/devfs.8#4 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.7 2003/07/26 12:41:44 simon Exp $
+.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.8 2003/09/14 13:41:57 ru Exp $
.\"
.Dd July 1, 2002
.Dt DEVFS 8
@@ -278,7 +278,7 @@
.Pa /dev/speaker
was created,
this command will cause its file mode to be changed to 666,
-as rule rule prescribes.
+as rule prescribes.
.Pp
.Dl devfs rule add path "snp*" mode 660 group snoopers
.Pp
==== //depot/projects/trustedbsd/sebsd/sbin/dhclient/Makefile.inc#4 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/sbin/dhclient/Makefile.inc,v 1.5 2003/07/28 08:30:11 mbr Exp $
+# $FreeBSD: src/sbin/dhclient/Makefile.inc,v 1.6 2003/08/09 20:36:06 mbr Exp $
MAINTAINER= murray
WARNS= 0
-CFLAGS+= -I${DIST_DIR}/includes -DENABLE_POLLING_MODE
+CFLAGS+= -I${DIST_DIR}/includes -DENABLE_POLLING_MODE -DNOMINUM
CLIENTBINDIR= /sbin
RUNDIR= /var/run
==== //depot/projects/trustedbsd/sebsd/sbin/disklabel/disklabel.5#4 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)disklabel.5.5 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/sbin/disklabel/disklabel.5,v 1.15 2002/12/12 17:25:54 ru Exp $
+.\" $FreeBSD: src/sbin/disklabel/disklabel.5,v 1.16 2003/09/10 19:24:34 ru Exp $
.\"
.Dd June 5, 1993
.Dt DISKLABEL 5
@@ -103,7 +103,7 @@
.Xr disklabel 8 .
.Pp
The format of the disk label, as specified in
-.Pa <sys/disklabel.h> ,
+.In sys/disklabel.h ,
is
.Bd -literal
#ifndef _SYS_DISKLABEL_H_
==== //depot/projects/trustedbsd/sebsd/sbin/disklabel/disklabel.8#4 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)disklabel.8 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.52 2003/05/19 19:52:29 ru Exp $
+.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.53 2003/09/08 19:57:18 ru Exp $
.\"
.Dd March 15, 2003
.Dt DISKLABEL 8
@@ -695,7 +695,7 @@
(See the definitions starting with
.Dv FS_UNUSED
in
-.Aq Pa sys/disklabel.h
+.In sys/disklabel.h
for more details.)
.It Ar fsize
For
==== //depot/projects/trustedbsd/sebsd/sbin/dump/optr.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/dump/optr.c,v 1.25 2003/04/07 11:34:12 mdodd Exp $";
+ "$FreeBSD: src/sbin/dump/optr.c,v 1.27 2003/09/21 22:14:49 ps Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -227,17 +227,20 @@
msg(const char *fmt, ...)
{
va_list ap;
+ va_list ap2;
(void) fprintf(stderr," DUMP: ");
#ifdef TDEBUG
(void) fprintf(stderr, "pid=%d ", getpid());
#endif
va_start(ap, fmt);
+ va_copy(ap2, ap);
(void) vfprintf(stderr, fmt, ap);
(void) fflush(stdout);
(void) fflush(stderr);
- (void) vsnprintf(lastmsg, sizeof(lastmsg), fmt, ap);
+ (void) vsnprintf(lastmsg, sizeof(lastmsg), fmt, ap2);
va_end(ap);
+ va_end(ap2);
}
void
==== //depot/projects/trustedbsd/sebsd/sbin/ffsinfo/Makefile#4 (text+ko) ====
@@ -1,7 +1,7 @@
# @(#)Makefile 8.8 (Berkeley) 6/21/2000
#
# $TSHeader: src/sbin/ffsinfo/Makefile,v 1.3 2000/12/05 19:45:10 tomsoft Exp $
-# $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.5 2003/06/11 23:24:31 obrien Exp $
+# $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.6 2003/08/14 18:55:31 rwatson Exp $
#
MAINTAINER= tomsoft at FreeBSD.ORG, chm at FreeBSD.ORG
@@ -15,5 +15,7 @@
WARNS?= 0
CFLAGS+=-DFS_DEBUG -I${GROWFS}
+DPADD= ${LIBUFS}
+LDADD= -lufs
.include <bsd.prog.mk>
==== //depot/projects/trustedbsd/sebsd/sbin/ffsinfo/ffsinfo.8#2 (text+ko) ====
@@ -35,7 +35,7 @@
.\" SUCH DAMAGE.
.\"
.\" $TSHeader: src/sbin/ffsinfo/ffsinfo.8,v 1.3 2000/12/12 19:30:55 tomsoft Exp $
-.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.12 2002/08/21 18:10:14 trhodes Exp $
+.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.13 2003/08/14 18:55:31 rwatson Exp $
.\"
.Dd September 8, 2000
.Dt FSINFO 8
@@ -45,7 +45,6 @@
.Nd "dump all meta information of an existing ufs file system"
.Sh SYNOPSIS
.Nm
-.Op Fl L
.Op Fl g Ar cylinder_group
.Op Fl i Ar inode
.Op Fl l Ar level
@@ -65,9 +64,6 @@
.Pp
The following options are available:
.Bl -tag -width indent
-.It Fl L
-Specifying this option skips the tests of the disklabel.
-This is done automatically, if the specified filename to dump is a plain file.
.It Fl g Ar cylinder_group
This restricts the dump to information about this cylinder group only.
Here
@@ -104,8 +100,6 @@
fragment allocation bitmap
.It Ar 0x040
cluster maps and summary
-.It Ar 0x080
-rotational layout tables
.It Ar 0x100
inode information
.It Ar 0x200
@@ -126,13 +120,7 @@
.Pa /dev/vinum/testvol
with all available information.
.Sh BUGS
-Currently
-.Nm
-can only dump unmounted file systems.
-Do not try dumping a mounted file system, your system may panic and you will
-not be able to use the file system any longer.
-.Pp
-Also snapshots are handled like plain files.
+Snapshots are handled like plain files.
They should get their own level to provide for independent control of the
amount of what gets dumped.
It probably also makes sense to some extend to dump the snapshot as a
==== //depot/projects/trustedbsd/sebsd/sbin/ffsinfo/ffsinfo.c#2 (text+ko) ====
@@ -48,19 +48,25 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.5 2002/08/21 18:10:14 trhodes Exp $";
+ "$FreeBSD: src/sbin/ffsinfo/ffsinfo.c,v 1.6 2003/08/14 18:55:31 rwatson Exp $";
#endif /* not lint */
/* ********************************************************** INCLUDES ***** */
#include <sys/param.h>
#include <sys/disklabel.h>
+#include <sys/mount.h>
#include <sys/stat.h>
-#include <stdio.h>
-#include <paths.h>
+#include <ufs/ufs/ufsmount.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
+
#include <ctype.h>
#include <err.h>
#include <fcntl.h>
+#include <libufs.h>
+#include <paths.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -72,20 +78,18 @@
int _dbg_lvl_ = (DL_INFO); /* DL_TRC */
#endif /* FS_DEBUG */
+struct uufsd disk;
+
+#define sblock disk.d_fs
+#define acg disk.d_cg
+
static union {
- struct fs fs;
- char pad[SBSIZE];
-} fsun1, fsun2;
-#define sblock fsun1.fs
-#define osblock fsun2.fs
+ struct fs fs;
+ char pad[SBLOCKSIZE];
+} fsun;
-static union {
- struct cg cg;
- char pad[MAXBSIZE];
-} cgun1;
-#define acg cgun1.cg
+#define osblock fsun.fs
-static char ablk[MAXBSIZE];
static char i1blk[MAXBSIZE];
static char i2blk[MAXBSIZE];
static char i3blk[MAXBSIZE];
@@ -93,36 +97,14 @@
static struct csum *fscs;
/* ******************************************************** PROTOTYPES ***** */
-static void rdfs(daddr_t, size_t, void *, int);
static void usage(void);
-static struct disklabel *get_disklabel(int);
-static struct dinode *ginode(ino_t, int);
-static void dump_whole_inode(ino_t, int, int);
+static void dump_whole_ufs1_inode(ino_t, int);
+static void dump_whole_ufs2_inode(ino_t, int);
-/* ************************************************************** rdfs ***** */
-/*
- * Here we read some block(s) from disk.
- */
-void
-rdfs(daddr_t bno, size_t size, void *bf, int fsi)
-{
- DBG_FUNC("rdfs")
- ssize_t n;
-
- DBG_ENTER;
-
- if (lseek(fsi, (off_t)bno * DEV_BSIZE, 0) < 0) {
- err(33, "rdfs: seek error: %ld", (long)bno);
- }
- n = read(fsi, bf, size);
- if (n != (ssize_t)size) {
- err(34, "rdfs: read error: %ld", (long)bno);
- }
+#define DUMP_WHOLE_INODE(A,B) \
+ ( disk.d_ufs == 1 \
+ ? dump_whole_ufs1_inode((A),(B)) : dump_whole_ufs2_inode((A),(B)) )
- DBG_LEAVE;
- return;
-}
-
/* ************************************************************** main ***** */
/*
* ffsinfo(8) is a tool to dump all metadata of a file system. It helps to find
@@ -140,13 +122,10 @@
main(int argc, char **argv)
{
DBG_FUNC("main")
- char *device, *special, *cp;
+ char *device, *special;
char ch;
size_t len;
struct stat st;
- struct disklabel *lp;
- struct partition *pp;
- int fsi;
struct csum *dbg_csp;
int dbg_csc;
char dbg_line[80];
@@ -155,7 +134,6 @@
int cg_start, cg_stop;
ino_t in;
char *out_file;
- int Lflag=0;
DBG_ENTER;
@@ -167,11 +145,8 @@
errx(1, "strdup failed");
}
- while ((ch=getopt(argc, argv, "Lg:i:l:o:")) != -1) {
+ while ((ch=getopt(argc, argv, "g:i:l:o:")) != -1) {
switch(ch) {
- case 'L':
- Lflag=1;
- break;
case 'g':
cfg_cg=atol(optarg);
if(cfg_cg < -1) {
@@ -248,58 +223,9 @@
device = special;
}
- /*
- * Open our device for reading.
- */
- fsi = open(device, O_RDONLY);
- if (fsi < 0) {
- err(1, "%s", device);
- }
-
- stat(device, &st);
-
- if(S_ISREG(st.st_mode)) { /* label check not supported for files */
- Lflag=1;
- }
-
- if(!Lflag) {
- /*
- * Try to read a label and gess the slice if not specified.
- * This code should guess the right thing and avaid to bother
- * the user user with the task of specifying the option -v on
- * vinum volumes.
- */
- cp=device+strlen(device)-1;
- lp = get_disklabel(fsi);
- if(lp->d_type == DTYPE_VINUM) {
- pp = &lp->d_partitions[0];
- } else if (isdigit(*cp)) {
- pp = &lp->d_partitions[2];
- } else if (*cp>='a' && *cp<='h') {
- pp = &lp->d_partitions[*cp - 'a'];
- } else {
- errx(1, "unknown device");
- }
-
- /*
- * Check if that partition looks suited for dumping.
- */
- if (pp->p_size < 1) {
- errx(1, "partition is unavailable");
- }
- if (pp->p_fstype != FS_BSDFFS) {
- errx(1, "partition not 4.2BSD");
- }
- }
+ if (ufs_disk_fillout(&disk, device) == -1)
+ err(1, "ufs_disk_fillout(%s) failed: %s", device, disk.d_error);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list