From: Carsten Schlote <[email protected]>
- Added the plog and pppoe-discovery tools as install option.
- Added install_copy for plog.
- Updated install_copy for pppoe-discovery
Note: pppoe-discovery install code was already there, but no kconfig
entry to select it. Also the install location was wrong.
Signed-off-by: Carsten Schlote <[email protected]>
---
rules/ppp.in | 20 ++++++++++++++++----
rules/ppp.make | 14 ++++++++++----
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/rules/ppp.in b/rules/ppp.in
index 827d500..209bc2d 100644
--- a/rules/ppp.in
+++ b/rules/ppp.in
@@ -144,10 +144,8 @@ config PPP_RADREALMS
config PPP_OE
bool
- default y
prompt "ppp over ethernet"
help
-
Enable this if you are using a DSL modem connected via
ethernet to your host (so called 'PPP over Ethernet' = PPPoE).
@@ -202,9 +200,23 @@ config PPP_INST_PPPSTATS
intervals for a specified PPP interface.
config PPP_INST_PONOFF
- bool "install pon/poff"
+ bool "Install pon, poff scripts"
+ help
+ Install pon and poff utils to start and stop a PPP connection
+
+config PPP_INST_PLOG
+ bool "Install plog script"
help
- FIXME
+ Install plog util to monitor PPP logs
+
+config PPP_INST_OE_DISCOVERY
+ bool "Install pppoe-discovery"
+ select PPP_PLUGINS
+ select PPP_OE
+ help
+ Added pppoe-discovery tools to use PPP e.g. with DSL
+
+comment "startup options"
config PPP_STARTSCRIPT
bool
diff --git a/rules/ppp.make b/rules/ppp.make
index 046175f..eb4f56a 100644
--- a/rules/ppp.make
+++ b/rules/ppp.make
@@ -200,6 +200,16 @@ ifdef PTXCONF_PPP_INST_PONOFF
@$(call install_alternative, ppp, 0, 0, 0755, /usr/bin/poff)
endif
+ifdef PTXCONF_PPP_INST_PLOG
+ @$(call install_copy, ppp, 0, 0, 0755, \
+ $(PPP_DIR)/scripts/plog, /usr/sbin/plog)
+endif
+
+ifdef PTXCONF_PPP_INST_OE_DISCOVERY
+ @$(call install_copy, ppp, 0, 0, 0755, -, \
+ /usr/sbin/pppoe-discovery)
+endif
+
ifdef PTXCONF_PPP_PLUGINS
@$(call install_copy, ppp, 0, 0, 0755, $(PPP_SHARED_INST_PATH))
endif
@@ -224,10 +234,6 @@ ifdef PTXCONF_PPP_OE
@$(call install_copy, ppp, 0, 0, 0644, -, \
$(PPP_SHARED_INST_PATH)/rp-pppoe.so)
endif
-ifdef PTXCONF_PPP_PLUGIN_RP_PPPOE_DISCOVERY
- @$(call install_copy, ppp, 0, 0, 0755, -, \
- $(PPP_SHARED_INST_PATH)/pppoe-discovery)
-endif
ifdef PTXCONF_PPP_MINCONN
@$(call install_copy, ppp, 0, 0, 0644, -, \
$(PPP_SHARED_INST_PATH)/minconn.so)
--
1.6.6.1
--
ptxdist mailing list
[email protected]
