LGTM, thanks On Thu Nov 06 2014 at 10:54:25 AM 'Petr Pudlak' via ganeti-devel < [email protected]> wrote:
> commit ebb1d31d71c044581a7bd1e5230b35e2babe850d > Merge: 07ff3e2 d61fe8a > Author: Petr Pudlak <[email protected]> > Date: Thu Nov 6 10:35:59 2014 +0100 > > Merge branch 'stable-2.12' into stable-2.13 > > * stable-2.12 > Check for all NICs when looking for a free metad NIC name > Use tools/vif-ganeti-metad when setting up Xen metad NIC > Add a script for setting up the metad NIC for Xen > Assemble Xen NIC parameters into a dictionary > > * stable-2.10 > Fix python shebang line in tools as well > Do not hard-code python path > > Conflicts: > Makefile.am - take additions from both versions > > Signed-off-by: Petr Pudlak <[email protected]> > > diff --cc Makefile.am > index 474d173,683507a..83d7df9 > --- a/Makefile.am > +++ b/Makefile.am > @@@ -320,8 -300,7 +322,9 @@@ CLEANFILES = > tools/net-common \ > tools/users-setup \ > tools/vcluster-setup \ > + tools/prepare-node-join \ > + tools/ssh-update \ > + $(python_scripts_shebang) \ > stamp-directories \ > stamp-srclinks \ > $(nodist_pkgpython_PYTHON) \ > @@@ -1344,9 -1288,17 +1350,18 @@@ python_scripts = > tools/move-instance \ > tools/ovfconverter \ > tools/post-upgrade \ > - tools/sanitize-config > + tools/sanitize-config \ > + tools/query-config > > + python_scripts_shebang = \ > + $(patsubst tools/%,tools/shebang/%, $(python_scripts)) > + > + tools/shebang/%: tools/% > + mkdir -p tools/shebang > + head -1 $< | sed 's|#!/usr/bin/python|#!$(PYTHON)|' > $@ > + echo '# Generated file; do not edit.' >> $@ > + tail -n +2 $< >> $@ > + > dist_tools_SCRIPTS = \ > tools/kvm-console-wrapper \ > tools/master-ip-setup \ >
