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 f55a1ae2170b2eaced6e797f8c7e66d0bd9831ca (commit) via d0c3a0c57691e3074cd95f91983cd81086d12bd6 (commit) via 090eda1dc856043a212923f8ac4bff5269249780 (commit) from 4d17a269dbd948f6c48f561552c328ab52b085ec (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 f55a1ae2170b2eaced6e797f8c7e66d0bd9831ca Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Aug 30 20:33:32 2010 +0200

Add iptv changes to core40.

commit d0c3a0c57691e3074cd95f91983cd81086d12bd6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Aug 30 18:01:47 2010 +0200

Add iptv over adsl to networking/red.

commit 090eda1dc856043a212923f8ac4bff5269249780 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Aug 30 17:58:53 2010 +0200

Enabled iptv option with adsl.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/40/filelists/files | 2 + html/cgi-bin/pppsetup.cgi | 2 +- src/initscripts/init.d/networking/red | 111 +++++++++++++++-------------- 3 files changed, 60 insertions(+), 55 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/40/filelists/files b/config/rootfiles/core/40/filelists/files index 7375f0f..04075e6 100644 --- a/config/rootfiles/core/40/filelists/files +++ b/config/rootfiles/core/40/filelists/files @@ -8,9 +8,11 @@ var/ipfire/dhcp/dhcpd.conf.local etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/firewall etc/rc.d/init.d/functions +etc/rc.d/init.d/networking/red srv/web/ipfire/cgi-bin/backup.cgi srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/time.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/qos.cgi usr/lib/python2.7/ipaddr.pyc usr/lib/python2.7/site-packages/drv_libxml2.py diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index a39d4f7..fc28e70 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -727,7 +727,7 @@ END ; }

- if ($pppsettings{'TYPE'} eq 'vdsl') { + if ($pppsettings{'TYPE'} =~ /^(pppoe|vdsl|pppoeatm)$/) { print <<END <tr> <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>IPTV:</b></td> diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red index a574050..1940169 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -236,6 +236,21 @@ case "${1}" in

PPP_NIC=${DEVICE}

+ + if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then + PPP_NIC=nas0 + DEVICE=nas0 + boot_mesg "Createing ATM-Bridge as $PPP_NIC ..." + br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 & + sleep 1 + if [ "$TYPE" == "pppoeatm" ]; then + TYPE="pppoe" + fi + if [ "$TYPE" == "pptpatm" ]; then + TYPE="pptp" + fi + fi + if [ "$TYPE" == "vdsl" ]; then boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_INET_VLAN} ..." modprobe 8021q @@ -249,67 +264,55 @@ case "${1}" in sleep 0.2 ip link set ${PPP_NIC} up TYPE="pppoe" - if [ "${RED_VDSL_IPTV_DISABLE}" == "0" ]; then - PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid" - LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info" - # Test to see if there is a stale pid file - if [ -f "$PIDFILE" ]; then - ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null - if [ $? != 0 ]; then - rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null - fi + fi + if [ "${IPTV}" == "enable" ]; then + PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid" + LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info" + # Test to see if there is a stale pid file + if [ -f "$PIDFILE" ]; then + ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null + if [ $? != 0 ]; then + rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null fi + fi

- if [ ! -f "$PIDFILE" ]; then - boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_IPTV_VLAN} ..." - vconfig add ${DEVICE} ${RED_VDSL_IPTV_VLAN} - if [ -n "$MAC2" ]; then - boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_IPTV_VLAN} to ${MAC2}" - ip link set dev ${DEVICE}.${RED_VDSL_IPTV_VLAN} address ${MAC2} - evaluate_retval - fi - boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${RED_VDSL_IPTV_VLAN} interface..." - /sbin/dhcpcd ${DEVICE}.${RED_VDSL_IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1 - RET="$?" + if [ ! -f "$PIDFILE" ]; then + boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_IPTV_VLAN} ..." + modprobe 8021q + vconfig add ${DEVICE} ${RED_VDSL_IPTV_VLAN} + if [ -n "$MAC2" ]; then + boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_IPTV_VLAN} to ${MAC2}" + ip link set dev ${DEVICE}.${RED_VDSL_IPTV_VLAN} address ${MAC2} + evaluate_retval + fi + boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${RED_VDSL_IPTV_VLAN} interface..." + /sbin/dhcpcd ${DEVICE}.${RED_VDSL_IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1 + RET="$?"

- if [ "$RET" = "0" ]; then - . /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info - echo "" - echo_ok - boot_mesg " DHCP Assigned Settings for ${DEVICE}.${RED_VDSL_IPTV_VLAN}:" - boot_mesg_flush - boot_mesg " IP Address: $ip_address" - boot_mesg_flush - boot_mesg " Hostname: $RED_DHCP_HOSTNAME" - boot_mesg_flush - boot_mesg " Subnet Mask: $subnet_mask" - boot_mesg_flush - boot_mesg " Default Gateway: $routers" - boot_mesg_flush - boot_mesg " DNS Server: $domain_name_servers" - boot_mesg_flush + if [ "$RET" = "0" ]; then + . /var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info + echo "" + echo_ok + boot_mesg " DHCP Assigned Settings for ${DEVICE}.${RED_VDSL_IPTV_VLAN}:" + boot_mesg_flush + boot_mesg " IP Address: $ip_address" + boot_mesg_flush + boot_mesg " Hostname: $RED_DHCP_HOSTNAME" + boot_mesg_flush + boot_mesg " Subnet Mask: $subnet_mask" + boot_mesg_flush + boot_mesg " Default Gateway: $routers" + boot_mesg_flush + boot_mesg " DNS Server: $domain_name_servers" + boot_mesg_flush

- else - echo "" - $(exit "$RET") - evaluate_retval - fi + else + echo "" + $(exit "$RET") + evaluate_retval fi fi fi - - if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then - PPP_NIC=nas0 - boot_mesg "Createing ATM-Bridge as $PPP_NIC ..." - br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 & - sleep 1 - if [ "$TYPE" == "pppoeatm" ]; then - TYPE="pppoe" - fi - if [ "$TYPE" == "pptpatm" ]; then - TYPE="pptp" - fi - fi if [ "$TYPE" == "pppoe" ] || [ "$TYPE" == "pptp" ]; then if [ "$PPP_NIC" == "" ]; then boot_mesg "No device for red interface given. Check netsetup or dialprofile!" ${FAILURE}

hooks/post-receive -- IPFire 2.x development tree