diff --git a/distrib/sets/lists/base/lkm.mi b/distrib/sets/lists/base/lkm.mi index 33bee5a1bcff..3fd6402d6622 100644 --- a/distrib/sets/lists/base/lkm.mi +++ b/distrib/sets/lists/base/lkm.mi @@ -1,4 +1,4 @@ -# $NetBSD: lkm.mi,v 1.16 2006/12/29 17:00:08 pooka Exp $ +# $NetBSD: lkm.mi,v 1.17 2007/03/05 23:18:01 dillo Exp $ ./usr/lkm/adosfs.o base-vfs-lkm ./usr/lkm/bsdcomp.o base-ppp-lkm ./usr/lkm/cd9660.o base-vfs-lkm @@ -8,6 +8,7 @@ ./usr/lkm/ext2fs.o base-vfs-lkm ./usr/lkm/fdesc.o base-vfs-lkm ./usr/lkm/filecorefs.o base-vfs-lkm +./usr/lkm/hfsp.o base-vfs-lkm ./usr/lkm/if_ipl.o base-ipf-lkm ipfilter ./usr/lkm/lfs.o base-vfs-lkm ./usr/lkm/kernfs.o base-vfs-lkm diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 6220e61bf73b..6dae6ceadb87 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.691 2007/03/05 16:57:06 tnozaki Exp $ +# $NetBSD: mi,v 1.692 2007/03/05 23:18:02 dillo Exp $ . base-sys-root ./altroot base-sys-root ./bin base-sys-root @@ -121,6 +121,7 @@ ./root base-sys-root ./sbin base-sys-root ./sbin/amrctl base-sysutil-root +./sbin/apmlabel base-sysutil-root ./sbin/atactl base-sysutil-root ./sbin/badsect base-sysutil-root ./sbin/brconfig base-netutil-root @@ -167,6 +168,7 @@ ./sbin/mount_fdesc base-miscfs-root ./sbin/mount_ffs base-sysutil-root ./sbin/mount_filecore base-filecorefs-root +./sbin/mount_hfsp base-hfsp-root ./sbin/mount_kernfs base-sysutil-root ./sbin/mount_lfs base-sysutil-root ./sbin/mount_mfs base-sysutil-root @@ -767,6 +769,7 @@ ./usr/include/dev/wscons base-c-usr ./usr/include/filecorefs base-c-usr ./usr/include/fs base-c-usr +./usr/include/fs/hfsp base-c-usr ./usr/include/fs/puffs base-c-usr ./usr/include/fs/smbfs base-c-usr ./usr/include/fs/sysvbfs base-c-usr diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 1748add9fb7e..3a03f6e56b2b 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1013 2007/02/28 16:23:22 xtraeme Exp $ +# $NetBSD: mi,v 1.1014 2007/03/05 23:18:02 dillo Exp $ ./etc/mtree/set.comp comp-sys-root ./usr/bin/addr2line comp-debug-bin bfd ./usr/bin/ar comp-util-bin bfd @@ -535,6 +535,8 @@ ./usr/include/fnmatch.h comp-c-include ./usr/include/form.h comp-c-include ./usr/include/frame.h comp-obsolete obsolete +./usr/include/fs/hfsp/hfsp.h comp-c-inlcude +./usr/include/fs/hfsp/libhfsp.h comp-c-inlcude ./usr/include/fs/puffs/puffs_msgif.h comp-c-include ./usr/include/fs/sysvbfs/bfs.h comp-c-include ./usr/include/fs/udf/ecma167-udf.h comp-c-include diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index ec7819a653ba..9c9e9cb1030f 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.981 2007/03/02 09:45:32 wiz Exp $ +# $NetBSD: mi,v 1.982 2007/03/05 23:18:04 dillo Exp $ ./etc/mtree/set.man man-sys-root ./usr/share/info/am-utils.info man-amd-info info ./usr/share/info/as.info man-computil-info bfd,info @@ -1765,6 +1765,7 @@ ./usr/share/man/cat8/anvil.0 man-postfix-catman postfix,.cat ./usr/share/man/cat8/apm.0 man-sysutil-catman .cat ./usr/share/man/cat8/apmd.0 man-sysutil-catman .cat +./usr/share/man/cat8/apmlabel.0 man-sysutil-catman .cat ./usr/share/man/cat8/arc/MAKEDEV.0 man-obsolete obsolete ./usr/share/man/cat8/arc/makedev.0 man-obsolete obsolete ./usr/share/man/cat8/arm26/BBBB.0 man-obsolete obsolete @@ -2066,6 +2067,7 @@ ./usr/share/man/cat8/mount_fdesc.0 man-miscfs-catman .cat ./usr/share/man/cat8/mount_ffs.0 man-sysutil-catman .cat ./usr/share/man/cat8/mount_filecore.0 man-filecorefs-catman .cat +./usr/share/man/cat8/mount_hfsp.0 man-hfsp-catman .cat ./usr/share/man/cat8/mount_kernfs.0 man-sysutil-catman .cat ./usr/share/man/cat8/mount_lfs.0 man-sysutil-catman .cat ./usr/share/man/cat8/mount_mfs.0 man-sysutil-catman .cat @@ -4185,6 +4187,7 @@ ./usr/share/man/man8/anvil.8 man-postfix-man postfix,.man ./usr/share/man/man8/apm.8 man-sysutil-man .man ./usr/share/man/man8/apmd.8 man-sysutil-man .man +./usr/share/man/man8/apmlabel.8 man-sysutil-man .man ./usr/share/man/man8/arc/MAKEDEV.8 man-obsolete obsolete ./usr/share/man/man8/arc/makedev.8 man-obsolete obsolete ./usr/share/man/man8/arm26/BBBB.8 man-obsolete obsolete @@ -4487,6 +4490,7 @@ ./usr/share/man/man8/mount_fdesc.8 man-miscfs-man .man ./usr/share/man/man8/mount_ffs.8 man-sysutil-man .man ./usr/share/man/man8/mount_filecore.8 man-filecorefs-man .man +./usr/share/man/man8/mount_hfsp.8 man-hfsp-man .man ./usr/share/man/man8/mount_kernfs.8 man-sysutil-man .man ./usr/share/man/man8/mount_lfs.8 man-sysutil-man .man ./usr/share/man/man8/mount_mfs.8 man-sysutil-man .man diff --git a/sbin/Makefile b/sbin/Makefile index 70c098bafbd8..197df24259d9 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.102 2007/03/01 22:01:29 martin Exp $ +# $NetBSD: Makefile,v 1.103 2007/03/05 23:18:05 dillo Exp $ # @(#)Makefile 8.5 (Berkeley) 3/31/94 # Not ported: XNSrouted enpload scsiformat startslip @@ -6,9 +6,9 @@ .include -SUBDIR= amrctl atactl badsect bim brconfig ccdconfig disklabel dkctl dmesg \ - dkscan_bsdlabel drvctl edlabel fastboot fdisk fsck fsirand gpt \ - ifconfig init ldconfig \ +SUBDIR= amrctl apmlabel atactl badsect bim brconfig ccdconfig disklabel \ + dkctl dkscan_bsdlabel dmesg \ + drvctl edlabel fastboot fdisk fsck fsirand gpt ifconfig init ldconfig \ mbrlabel mknod modload modunload mount newbtconf nologin \ pdisk ping pppoectl raidctl reboot rcorder rndctl route routed \ savecore scan_ffs scsictl shutdown slattach swapctl sysctl ttyflags \ @@ -26,6 +26,7 @@ SUBDIR+= mount_ext2fs SUBDIR+= mount_fdesc SUBDIR+= mount_filecore SUBDIR+= mount_ffs +SUBDIR+= mount_hfsp SUBDIR+= mount_kernfs SUBDIR+= mount_lfs SUBDIR+= mount_msdos diff --git a/sys/conf/files b/sys/conf/files index 923c16d2dd89..76ab8b526325 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.831 2007/02/10 11:55:23 ad Exp $ +# $NetBSD: files,v 1.832 2007/03/05 23:18:05 dillo Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -1192,6 +1192,7 @@ include "coda/files.coda" include "fs/adosfs/files.adosfs" include "fs/cd9660/files.cd9660" include "fs/filecorefs/files.filecorefs" +include "fs/hfsp/files.hfsp" include "fs/msdosfs/files.msdosfs" include "fs/ntfs/files.ntfs" include "fs/ptyfs/files.ptyfs" diff --git a/sys/fs/Makefile b/sys/fs/Makefile index adb88ace2bd1..685f92dba122 100644 --- a/sys/fs/Makefile +++ b/sys/fs/Makefile @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.13 2006/10/22 22:43:23 pooka Exp $ +# $NetBSD: Makefile,v 1.14 2007/03/05 23:18:05 dillo Exp $ -SUBDIR= adosfs cd9660 filecorefs msdosfs ntfs puffs smbfs sysvbfs udf union +SUBDIR= adosfs cd9660 filecorefs hfsp msdosfs ntfs puffs smbfs sysvbfs udf union .include diff --git a/sys/lkm/vfs/Makefile b/sys/lkm/vfs/Makefile index ae6ef6efdeaa..463347672563 100644 --- a/sys/lkm/vfs/Makefile +++ b/sys/lkm/vfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/12/29 17:00:08 pooka Exp $ +# $NetBSD: Makefile,v 1.18 2007/03/05 23:18:06 dillo Exp $ .include @@ -7,6 +7,7 @@ SUBDIR+= cd9660 SUBDIR+= coda SUBDIR+= coda5 SUBDIR+= filecorefs +SUBDIR+= hfsp SUBDIR+= miscfs SUBDIR+= msdosfs SUBDIR+= ntfs diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 2cc2b7e12bc7..bb08a8a7f8d0 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1,4 +1,4 @@ -/* $NetBSD: mount.h,v 1.152 2007/01/19 14:49:11 hannken Exp $ */ +/* $NetBSD: mount.h,v 1.153 2007/03/05 23:18:08 dillo Exp $ */ /* * Copyright (c) 1989, 1991, 1993 @@ -85,6 +85,7 @@ #define MOUNT_UDF "udf" /* UDF CD/DVD filesystem */ #define MOUNT_SYSVBFS "sysvbfs" /* System V Boot Filesystem */ #define MOUNT_PUFFS "puffs" /* Pass-to-Userspace filesystem */ +#define MOUNT_HFSP "hfsp" /* Apple HFS+ Filesystem */ /* * Structure per mounted file system. Each mounted file system has an