From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 23 Jun 2012 22:32:25 +0000 (+0000)
Subject: pppoe-server: Remove -k flag.
X-Git-Tag: 004~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=680cc68948940df8bf5bd68bea016c3b87d6d531;p=network.git

pppoe-server: Remove -k flag.

Our version of rp-pppoe's pppoe-server does not support
the userspace implementation. Therefore, kernel-mode
PPPoE is enabled by default and the -k option is not
present anymore.
---

diff --git a/ppp/pppoe-server b/ppp/pppoe-server
index a3bc9966..01538ba7 100644
--- a/ppp/pppoe-server
+++ b/ppp/pppoe-server
@@ -53,7 +53,10 @@ case "${action}" in
 		pppoe_cmdline="${pppoe_cmdline} -I ${zone}"
 
 		# Enable kernel-mode PPPoE.
-		pppoe_cmdline="${pppoe_cmdline} -k"
+		# (The version that is shipped with IPFire does not
+		# support the userspace implementation and therefore
+		# kernel-mode PPPoE is enabled by default).
+		#pppoe_cmdline="${pppoe_cmdline} -k"
 
 		# Randomize session IDs.
 		pppoe_cmdline="${pppoe_cmdline} -r"