diff options
-rw-r--r-- | etc/mtree/BSD.include.dist | 2 | ||||
-rw-r--r-- | sbin/geom/class/Makefile | 1 | ||||
-rw-r--r-- | sbin/geom/core/geom.8 | 1 | ||||
-rw-r--r-- | sys/conf/NOTES | 1 | ||||
-rw-r--r-- | sys/conf/files | 1 | ||||
-rw-r--r-- | sys/conf/options | 1 | ||||
-rw-r--r-- | sys/modules/geom/Makefile | 1 |
7 files changed, 8 insertions, 0 deletions
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index f07cc39..d49493d 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -94,6 +94,8 @@ .. raid3 .. + shsec + .. stripe .. .. diff --git a/sbin/geom/class/Makefile b/sbin/geom/class/Makefile index 0fb33b1..84185cf 100644 --- a/sbin/geom/class/Makefile +++ b/sbin/geom/class/Makefile @@ -5,6 +5,7 @@ SUBDIR+=label SUBDIR+=mirror SUBDIR+=nop SUBDIR+=raid3 +SUBDIR+=shsec SUBDIR+=stripe .include <bsd.subdir.mk> diff --git a/sbin/geom/core/geom.8 b/sbin/geom/core/geom.8 index a5505fa..f6fda36 100644 --- a/sbin/geom/core/geom.8 +++ b/sbin/geom/core/geom.8 @@ -121,6 +121,7 @@ Exit status is 0 on success, and 1 if the command fails. .Xr gmirror 8 , .Xr gnop 8 , .Xr graid3 8 , +.Xr gshsec 8 .Xr gstripe 8 .Sh HISTORY The diff --git a/sys/conf/NOTES b/sys/conf/NOTES index ca91c22..e43f2de 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -131,6 +131,7 @@ options GEOM_MIRROR # Disk mirroring. options GEOM_NOP # Test class. options GEOM_PC98 # NEC PC9800 partitioning options GEOM_RAID3 # RAID3 functionality. +options GEOM_SHSEC # Shared secret. options GEOM_STRIPE # Disk striping. options GEOM_SUNLABEL # Sun/Solaris partitioning options GEOM_UZIP # Read-only compressed disks diff --git a/sys/conf/files b/sys/conf/files index e33ec6c..0ae0d64 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -983,6 +983,7 @@ geom/mirror/g_mirror_ctl.c optional geom_mirror geom/nop/g_nop.c optional geom_nop geom/raid3/g_raid3.c optional geom_raid3 geom/raid3/g_raid3_ctl.c optional geom_raid3 +geom/shsec/g_shsec.c optional geom_shsec geom/stripe/g_stripe.c optional geom_stripe geom/uzip/g_uzip.c optional geom_uzip gnu/ext2fs/ext2_alloc.c optional ext2fs \ diff --git a/sys/conf/options b/sys/conf/options index d45ca06..8398bd7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -83,6 +83,7 @@ GEOM_MIRROR opt_geom.h GEOM_NOP opt_geom.h GEOM_PC98 opt_geom.h GEOM_RAID3 opt_geom.h +GEOM_SHSEC opt_geom.h GEOM_STRIPE opt_geom.h GEOM_SUNLABEL opt_geom.h GEOM_UZIP opt_geom.h diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile index e072ffb..21a1b5c 100644 --- a/sys/modules/geom/Makefile +++ b/sys/modules/geom/Makefile @@ -14,6 +14,7 @@ SUBDIR= geom_apple \ geom_nop \ geom_pc98 \ geom_raid3 \ + geom_shsec \ geom_stripe \ geom_sunlabel \ geom_uzip \ |