This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 164a3b51a9891690695547fe84c8d7eef16af444 (commit) from ff7a39506abf741d8e57647453a6171a0cc563fd (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 164a3b51a9891690695547fe84c8d7eef16af444 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Feb 19 20:47:38 2011 +0100
Add optional route to pptp server.
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/pppsetup.cgi | 6 ++++++ src/initscripts/init.d/networking/red | 8 ++++++++ 2 files changed, 14 insertions(+), 0 deletions(-)
Difference in files: diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 443c201..4c7bb8c 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -709,6 +709,11 @@ print <<END <td width='25%'>My Netconfig</td> <td colspan='3'><input size=50 type='text' name='PPTP_NICCFG' value='$pppsettings{'PPTP_NICCFG'}' /></td> </tr> +<tr> + <td width='25%'>PPTP Route <img src='/blob.gif' alt='*' /></td> + <td colspan='3'><input size=50 type='text' name='PPTP_ROUTE' value='$pppsettings{'PPTP_ROUTE'}' /></td> +</tr> + END ; } @@ -927,6 +932,7 @@ sub initprofile $pppsettings{'VCI'} = '32'; $pppsettings{'PPTP_PEER'} = '10.0.0.138'; $pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255'; + $pppsettings{'PPTP_ROUTE'} = ''; $pppsettings{'PROTOCOL'} = 'RFC2364'; $pppsettings{'MTU'} = '1492'; $pppsettings{'MRU'} = '1492'; diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index 0c41663..1e4af55 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -363,6 +363,10 @@ case "${1}" in fi fi ip link set ${PPP_NIC} up + if [ -n "${PPTP_ROUTE}" ]; then + boot_mesg "Set route ${PPTP_ROUTE} to pptp server..." + route add ${PPTP_ROUTE} + fi else boot_mesg "Bringing up the PPP via ${TYPE} on ${COMPORT}..." fi @@ -551,6 +555,10 @@ case "${1}" in fi fi
+ if [ -n "${PPTP_ROUTE}" ]; then + route del ${PPTP_ROUTE} + fi + if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then link_status=`ip link show $DEVICE.${INET_VLAN} 2> /dev/null` if [ -n "${link_status}" ]; then
hooks/post-receive -- IPFire 2.x development tree