Module Name: src
Committed By: hubertf
Date: Fri Feb 12 15:51:16 UTC 2010
Modified Files:
src/sys/arch/i386/conf: ALL GENERIC
Log Message:
Add PPPOE_SERVER
- disabled (commented out) in GENERIC,
- enabled in ALL
To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.967 -r1.968 src/sys/arch/i386/conf/GENERIC
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/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.237 src/sys/arch/i386/conf/ALL:1.238
--- src/sys/arch/i386/conf/ALL:1.237 Wed Feb 10 19:54:36 2010
+++ src/sys/arch/i386/conf/ALL Fri Feb 12 15:51:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.237 2010/02/10 19:54:36 tonio Exp $
+# $NetBSD: ALL,v 1.238 2010/02/12 15:51:16 hubertf Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.237 $"
+#ident "ALL-$Revision: 1.238 $"
maxusers 64 # estimated number of users
@@ -1567,6 +1567,7 @@
pseudo-device loop # network loopback
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
+options PPPOE_SERVER # Enable PPPoE server via link0
pseudo-device sl # Serial Line IP
pseudo-device strip # Starmode Radio IP (Metricom)
pseudo-device irframetty # IrDA frame line discipline
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.967 src/sys/arch/i386/conf/GENERIC:1.968
--- src/sys/arch/i386/conf/GENERIC:1.967 Wed Feb 10 19:54:36 2010
+++ src/sys/arch/i386/conf/GENERIC Fri Feb 12 15:51:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.967 2010/02/10 19:54:36 tonio Exp $
+# $NetBSD: GENERIC,v 1.968 2010/02/12 15:51:16 hubertf Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.967 $"
+#ident "GENERIC-$Revision: 1.968 $"
maxusers 64 # estimated number of users
@@ -1507,6 +1507,7 @@
pseudo-device loop # network loopback
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
+#options PPPOE_SERVER # Enable PPPoE server via link0
pseudo-device sl # Serial Line IP
pseudo-device strip # Starmode Radio IP (Metricom)
pseudo-device irframetty # IrDA frame line discipline
