Module Name:    src
Committed By:   mrg
Date:           Mon Jan 14 00:13:18 UTC 2019

Modified Files:
        src/sys/arch/sparc/conf: GENERIC KRUPS

Log Message:
normalise comment for fileassoc(8).  from PR#44873.


To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/sparc/conf/KRUPS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.262 src/sys/arch/sparc/conf/GENERIC:1.263
--- src/sys/arch/sparc/conf/GENERIC:1.262	Wed Dec 19 13:57:49 2018
+++ src/sys/arch/sparc/conf/GENERIC	Mon Jan 14 00:13:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.262 2018/12/19 13:57:49 maxv Exp $
+# $NetBSD: GENERIC,v 1.263 2019/01/14 00:13:18 mrg Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/sparc/conf/std.sparc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.262 $"
+#ident 		"GENERIC-$Revision: 1.263 $"
 
 maxusers	32
 
@@ -712,7 +712,7 @@ pseudo-device	wsmux			# mouse and keyboa
 pseudo-device	wsfont
 pseudo-device	putter			# for puffs and pud
 
-#options 	FILEASSOC		# fileassoc(9)
+#options 	FILEASSOC		# fileassoc(9) - required for Veriexec
 					# and PAX_SEGVGUARD
 
 # Veriexec

Index: src/sys/arch/sparc/conf/KRUPS
diff -u src/sys/arch/sparc/conf/KRUPS:1.78 src/sys/arch/sparc/conf/KRUPS:1.79
--- src/sys/arch/sparc/conf/KRUPS:1.78	Wed Dec 19 13:57:49 2018
+++ src/sys/arch/sparc/conf/KRUPS	Mon Jan 14 00:13:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.78 2018/12/19 13:57:49 maxv Exp $
+# $NetBSD: KRUPS,v 1.79 2019/01/14 00:13:18 mrg Exp $
 # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
 #
 # Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@ include 	"arch/sparc/conf/std.sparc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"KRUPS-$Revision: 1.78 $"
+#ident 		"KRUPS-$Revision: 1.79 $"
 
 maxusers	32
 
@@ -339,7 +339,7 @@ pseudo-device	putter			# for puffs and p
 
 #pseudo-device	fss			# file system snapshot device
 
-#options 	FILEASSOC		# fileassoc(9)
+#options 	FILEASSOC		# fileassoc(9) - required for Veriexec
 					# and PAX_SEGVGUARD
 
 # Veriexec

Reply via email to