Re: GEOM_VOL gc

on 09/06/2009 20:08 Andriy Gapon said the following:
> It seems that it is time to garbage-collect GEOM_VOL option:
> 
> $ glimpse -w GEOM_VOL
> /usr/src-head/sys/conf/options: GEOM_VOL        opt_geom.h
> /usr/src-head/sys/conf/NOTES: options   GEOM_VOL                # Volume names
> from UFS superblock
> /usr/src-head/sys/conf/NOTES: # around.  (See also option GEOM_VOL for a different
> solution to this
> /usr/src-head/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml:
> <literal>GEOM_VOL</literal> genutzt, k&ouml;nnen die

How about the following patch?
I am not sure though what to do with
de_DE.ISO8859-1/relnotes/common/new.sgml - I don't speak German and the
file seems quite aged (or a template?).


diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 7de53a2..0c612c8 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
_at__at_ -160,7 +160,6 _at__at_ options 	GEOM_STRIPE		# Disk striping.
 options 	GEOM_SUNLABEL		# Sun/Solaris partitioning
 options 	GEOM_UZIP		# Read-only compressed disks
 options 	GEOM_VIRSTOR		# Virtual storage.
-options 	GEOM_VOL		# Volume names from UFS superblock
 options 	GEOM_ZERO		# Performance testing helper.

 #
_at__at_ -1158,7 +1157,7 _at__at_ options 	PPS_SYNC
 # removed a disk drive, you may have had to rewrite your /etc/fstab
 # file, and also that you had to be careful when adding a new disk
 # as it may have been probed earlier and moved your device configuration
-# around.  (See also option GEOM_VOL for a different solution to this
+# around.  (See also option GEOM_LABEL for a different solution to this
 # problem.)

 # This old behavior is maintained as the default behavior.  The unit
diff --git a/sys/conf/options b/sys/conf/options
index 883f7ae..b0ff6ab 100644
--- a/sys/conf/options
+++ b/sys/conf/options
_at__at_ -104,7 +104,6 _at__at_ GEOM_STRIPE	opt_geom.h
 GEOM_SUNLABEL	opt_geom.h
 GEOM_UZIP	opt_geom.h
 GEOM_VIRSTOR	opt_geom.h
-GEOM_VOL	opt_geom.h
 GEOM_ZERO	opt_geom.h
 KDTRACE_HOOKS	opt_kdtrace.h
 KSTACK_MAX_PAGES



-- 
Andriy Gapon