From 81f9de8fd36650815a02f9c5b2e88245944a734d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 27 Jul 2010 12:22:57 +0200 Subject: [PATCH] avahi: remove udhcp support Signed-off-by: Stephan Raue --- .../config/busybox-udhcpc-default.script | 52 ------------- packages/network/avahi/install | 3 - .../network/avahi/scripts/udhcp-avahi.script | 74 ------------------- packages/network/avahi/scripts/udhcp.script | 47 ------------ 4 files changed, 176 deletions(-) delete mode 100644 packages/network/avahi/config/busybox-udhcpc-default.script delete mode 100755 packages/network/avahi/scripts/udhcp-avahi.script delete mode 100755 packages/network/avahi/scripts/udhcp.script diff --git a/packages/network/avahi/config/busybox-udhcpc-default.script b/packages/network/avahi/config/busybox-udhcpc-default.script deleted file mode 100644 index cc89feba72..0000000000 --- a/packages/network/avahi/config/busybox-udhcpc-default.script +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -# udhcpc script edited by Tim Riker - -[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 - -RESOLV_CONF="/etc/resolv.conf" -[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" -[ -n "$subnet" ] && NETMASK="netmask $subnet" - -case "$1" in - deconfig) - grep -q -v ip= /proc/cmdline - if [ $? -eq 0 ]; then - /sbin/ifconfig $interface up - fi - grep -q -v nfsroot= /proc/cmdline - if [ $? -eq 0 ]; then - /sbin/ifconfig $interface 0.0.0.0 - fi - if [ -x /usr/sbin/avahi-autoipd ]; then - /usr/sbin/avahi-autoipd -wD $interface --no-chroot - fi - ;; - - renew|bound) - if [ -x /usr/sbin/avahi-autoipd ]; then - /usr/sbin/avahi-autoipd -k $interface - fi - /sbin/ifconfig $interface $ip $BROADCAST $NETMASK - - if [ -n "$router" ] ; then - echo "deleting routers" - while route del default gw 0.0.0.0 dev $interface ; do - : - done - - for i in $router ; do - route add default gw $i dev $interface - done - fi - - echo -n > $RESOLV_CONF - [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF - for i in $dns ; do - echo adding dns $i - echo nameserver $i >> $RESOLV_CONF - done - ;; -esac - -exit 0 diff --git a/packages/network/avahi/install b/packages/network/avahi/install index b3a2d609a3..166e0ab870 100755 --- a/packages/network/avahi/install +++ b/packages/network/avahi/install @@ -50,6 +50,3 @@ mkdir -p $INSTALL/usr/share/avahi/introspection cp -PR $PKG_BUILD/avahi-daemon/RecordBrowser.introspect $INSTALL/usr/share/avahi/introspection cp -PR $PKG_BUILD/avahi-daemon/AddressResolver.introspect $INSTALL/usr/share/avahi/introspection -mkdir -p $INSTALL/usr/share/udhcpc - cp $PKG_DIR/scripts/udhcp-avahi.script $INSTALL/usr/share/udhcpc/default.script - diff --git a/packages/network/avahi/scripts/udhcp-avahi.script b/packages/network/avahi/scripts/udhcp-avahi.script deleted file mode 100755 index 2505c70f5f..0000000000 --- a/packages/network/avahi/scripts/udhcp-avahi.script +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh - -################################################################################ -# Copyright (C) 2009-2010 OpenELEC.tv -# http://www.openelec.tv -# -# udhcpc script edited by Tim Riker -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 - -RESOLV_CONF="/etc/resolv.conf" -[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" -[ -n "$subnet" ] && NETMASK="netmask $subnet" - -case "$1" in - deconfig) - grep -q -v ip= /proc/cmdline - if [ $? -eq 0 ]; then - /sbin/ifconfig $interface up - fi - grep -q -v nfsroot= /proc/cmdline - if [ $? -eq 0 ]; then - /sbin/ifconfig $interface 0.0.0.0 - fi - if [ -x /usr/sbin/avahi-autoipd ]; then - /usr/sbin/avahi-autoipd -wD $interface --no-chroot - fi - ;; - - renew|bound) - if [ -x /usr/sbin/avahi-autoipd ]; then - /usr/sbin/avahi-autoipd -k $interface - fi - /sbin/ifconfig $interface $ip $BROADCAST $NETMASK - - if [ -n "$router" ] ; then - echo "deleting routers" - while route del default gw 0.0.0.0 dev $interface ; do - : - done - - echo >/var/run/udhcpc - - for i in $router ; do - route add default gw $i dev $interface - done - fi - - echo -n > $RESOLV_CONF - [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF - for i in $dns ; do - echo adding dns $i - echo nameserver $i >> $RESOLV_CONF - done - ;; -esac - -exit 0 diff --git a/packages/network/avahi/scripts/udhcp.script b/packages/network/avahi/scripts/udhcp.script deleted file mode 100755 index 234e64a95e..0000000000 --- a/packages/network/avahi/scripts/udhcp.script +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -################################################################################ -# Copyright (C) 2009-2010 OpenELEC.tv -# http://www.openelec.tv -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -case "$1" in - deconfig) - ifconfig $interface 0.0.0.0 - ;; - - renew|bound) - if [ -n "$dns" ]; then - rm -f /etc/resolv.conf - [ -n "$domain" ] && echo "search $domain" >> /etc/resolv.conf - for ns in $dns; do - echo "nameserver $ns" >> /etc/resolv.conf - done - fi - [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" - [ -n "$subnet" ] && NETMASK="netmask $subnet" - ifconfig $interface $ip $BROADCAST $NETMASK - while route del default gw 0.0.0.0 dev $interface; do - : - done - metric=0 - for i in $router; do - route add default gw $i dev $interface metric $((metric++)) - done - ;; -esac