diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-02-09 08:19:35 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-02-09 08:19:35 +0000 |
| commit | fb5dec470b1c1fb35b16c20d031b682db2cc4ee0 (patch) | |
| tree | 21d5143457ceca63a5aefef35e744c58a71902a1 /net-libs/openslp | |
| parent | Add missing IUSE. (diff) | |
| download | gentoo-2-fb5dec470b1c1fb35b16c20d031b682db2cc4ee0.tar.gz gentoo-2-fb5dec470b1c1fb35b16c20d031b682db2cc4ee0.tar.bz2 gentoo-2-fb5dec470b1c1fb35b16c20d031b682db2cc4ee0.zip | |
The init script fails on a machine with multiple non-lo interfaces as route only takes one argument, I discovered this during testing fast booting, when there was no default route yet. I think it should not bother to check for a route anyway (as it is moot after there is a default route), but I'm not making that change.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/openslp')
| -rw-r--r-- | net-libs/openslp/ChangeLog | 9 | ||||
| -rw-r--r-- | net-libs/openslp/files/slpd-init | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/net-libs/openslp/ChangeLog b/net-libs/openslp/ChangeLog index dfc6649d0ad2..7763425282fb 100644 --- a/net-libs/openslp/ChangeLog +++ b/net-libs/openslp/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-libs/openslp # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/ChangeLog,v 1.49 2012/01/24 22:52:21 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/ChangeLog,v 1.50 2012/02/09 08:19:35 robbat2 Exp $ + + 09 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> files/slpd-init: + The init script fails on a machine with multiple non-lo interfaces as route + only takes one argument, I discovered this during testing fast booting, when + there was no default route yet. I think it should not bother to check for a + route anyway (as it is moot after there is a default route), but I'm not + making that change. 24 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> openslp-1.2.1-r2.ebuild, +files/openslp-1.2.1-cflags.patch: diff --git a/net-libs/openslp/files/slpd-init b/net-libs/openslp/files/slpd-init index 68657200dd34..bbc0eac1abc3 100644 --- a/net-libs/openslp/files/slpd-init +++ b/net-libs/openslp/files/slpd-init @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/files/slpd-init,v 1.4 2007/07/13 13:20:28 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/files/slpd-init,v 1.5 2012/02/09 08:19:35 robbat2 Exp $ depend() { need net @@ -27,7 +27,7 @@ multicast_route_set() { MSG_FAILED_TO_ADD=' FAILED - Route NOT Added.' MSG_SUCCES_ON_ADD=' SUCCESS - Route Added.' - CMD_GET_INTERFACE="netstat -i | awk 'BEGIN{}(NR>2)&&(!/^lo*/){print \$1}'" + CMD_GET_INTERFACE="netstat -i | awk 'BEGIN{}(NR>2)&&(!/^lo*/){print \$1;exit}'" CMD_ADD_ROUTE="route add -net 224.0.0.0 netmask 240.0.0.0" ping $PING_OPTIONS_1 $MULTICAST_ADDRESS 2> $TMP_FILE 1> /dev/null |