Anthony Liguori
2005-Oct-05 18:09 UTC
[Xen-devel] Re: [Xen-changelog] Add Gentoo handling to network-bridge. Based on patches
Hi Keir, The network-bridge script is executed under -e so you''ll either have to move the gentoo stuff before the set -e or refactor the if. Attached is a patch that moves it before the set -e since refactoring the if is gonna look pretty ugly. Regards, Anthony Liguori Xen patchbot -unstable wrote:># HG changeset patch ># User kaf24@firebug.cl.cam.ac.uk ># Node ID e579bef0d237a12d3d52e2e61a6d48632fe61aff ># Parent e643fccb851bb5ef271057e02455661f4beff1bc >Add Gentoo handling to network-bridge. Based on patches >from Jon Mason and Anthony Liguori. > >diff -r e643fccb851b -r e579bef0d237 tools/examples/network-bridge >--- a/tools/examples/network-bridge Wed Oct 5 13:10:49 2005 >+++ b/tools/examples/network-bridge Wed Oct 5 13:14:04 2005 >@@ -54,6 +54,17 @@ > antispoof=${antispoof:-no} > > echo "*network $OP bridge=$bridge netdev=$netdev antispoof=$antispoof" >&2 >+ >+# Gentoo doesn''t have ifup/ifdown: define appropriate alternatives >+which ifup >& /dev/null >+if [ "$?" != 0 -a -e /etc/conf.d/net ]; then >+ ifup() { >+ /etc/init.d/net.$1 start >+ } >+ ifdown() { >+ /etc/init.d/net.$1 stop >+ } >+fi > > # Usage: transfer_addrs src dst > # Copy all IP addresses (including aliases) from device $src to device $dst. > >_______________________________________________ >Xen-changelog mailing list >Xen-changelog@lists.xensource.com >http://lists.xensource.com/xen-changelog > > >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Jon Mason
2005-Oct-05 19:13 UTC
Re: [Xen-devel] Re: [Xen-changelog] Add Gentoo handling to network-bridge. Based on patches
The patch that was commited did not fix Gentoo bridging problem (as Anthony describes below). The patch below fixes it. Good work Anthony! Thanks, Jon On Wed, Oct 05, 2005 at 01:09:11PM -0500, Anthony Liguori wrote:> Hi Keir, > > The network-bridge script is executed under -e so you''ll either have to > move the gentoo stuff before the set -e or refactor the if. Attached is > a patch that moves it before the set -e since refactoring the if is > gonna look pretty ugly. > > Regards, > > Anthony Liguori > > Xen patchbot -unstable wrote: > > ># HG changeset patch > ># User kaf24@firebug.cl.cam.ac.uk > ># Node ID e579bef0d237a12d3d52e2e61a6d48632fe61aff > ># Parent e643fccb851bb5ef271057e02455661f4beff1bc > >Add Gentoo handling to network-bridge. Based on patches > >from Jon Mason and Anthony Liguori. > > > >diff -r e643fccb851b -r e579bef0d237 tools/examples/network-bridge > >--- a/tools/examples/network-bridge Wed Oct 5 13:10:49 2005 > >+++ b/tools/examples/network-bridge Wed Oct 5 13:14:04 2005 > >@@ -54,6 +54,17 @@ > >antispoof=${antispoof:-no} > > > >echo "*network $OP bridge=$bridge netdev=$netdev antispoof=$antispoof" >&2 > >+ > >+# Gentoo doesn''t have ifup/ifdown: define appropriate alternatives > >+which ifup >& /dev/null > >+if [ "$?" != 0 -a -e /etc/conf.d/net ]; then > >+ ifup() { > >+ /etc/init.d/net.$1 start > >+ } > >+ ifdown() { > >+ /etc/init.d/net.$1 stop > >+ } > >+fi > > > ># Usage: transfer_addrs src dst > ># Copy all IP addresses (including aliases) from device $src to device > >$dst. > > > >_______________________________________________ > >Xen-changelog mailing list > >Xen-changelog@lists.xensource.com > >http://lists.xensource.com/xen-changelog > > > > > > >> # HG changeset patch > # User anthony@localhost.localdomain > # Node ID f63d3f87db25e3cbe7309e1805a46357336e9200 > # Parent 6f71824a45c19e860a3655dd8e76a83e047c84d2 > Gentoo compatible stuff has to be done *before* the set -e. You could also do > the which in the if with a combination of ! and || after the set -e but I think > it''s cleaner to just do it before the set -e. > > Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> > > diff -r 6f71824a45c1 -r f63d3f87db25 tools/examples/network-bridge > --- a/tools/examples/network-bridge Wed Oct 5 18:06:42 2005 +0100 > +++ b/tools/examples/network-bridge Wed Oct 5 13:06:33 2005 -0500 > @@ -38,22 +38,6 @@ > # Print routes. > # > #===========================================================================> - > -# Exit if anything goes wrong. > -set -e > - > -# First arg is the operation. > -OP=$1 > -shift > - > -# Pull variables in args in to environment. > -for arg ; do export "${arg}" ; done > - > -bridge=${bridge:-xen-br0} > -netdev=${netdev:-eth0} > -antispoof=${antispoof:-no} > - > -echo "*network $OP bridge=$bridge netdev=$netdev antispoof=$antispoof" >&2 > > # Gentoo doesn''t have ifup/ifdown: define appropriate alternatives > which ifup >& /dev/null > @@ -65,6 +49,22 @@ > /etc/init.d/net.$1 stop > } > fi > + > +# Exit if anything goes wrong. > +set -e > + > +# First arg is the operation. > +OP=$1 > +shift > + > +# Pull variables in args in to environment. > +for arg ; do export "${arg}" ; done > + > +bridge=${bridge:-xen-br0} > +netdev=${netdev:-eth0} > +antispoof=${antispoof:-no} > + > +echo "*network $OP bridge=$bridge netdev=$netdev antispoof=$antispoof" >&2 > > # Usage: transfer_addrs src dst > # Copy all IP addresses (including aliases) from device $src to device $dst.> _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel