On Mon, Jul 25, 2011 at 2:17 PM, Iustin Pop <[email protected]> wrote: > On Mon, Jul 25, 2011 at 10:37:20AM -0400, Ben Lipton wrote: > > The fixes/ directory will be recursively copied to /usr/lib/ganeti/fixes > > on the bootstrap OS. It contains a few executable scripts which will be > > run with run-parts. If these are to be python scripts, most of their > > code should be contained in modules in fixes/fixlib/, so that they can > > be unit tested. > > > > This patch: > > - Updates p2v-target.conf.in so that python will be available on the > > bootstap os > > - Changes things so that scripts is no longer a package. This is a > > result of changing PYTHONPATH in Makefile.am. > > - Adds the hook script to install the fixes directory on the boostrap OS > > - Creates the fixes/fixlib directory where python modules for the > > scripts will live > > > > Signed-off-by: Ben Lipton <[email protected]> > > --- > > instance-p2v-target/fixes/fixlib/__init__.py | 12 +++++++++++ > > instance-p2v-target/hooks/install-fixes.in | 21 > ++++++++++++++++++++ > > instance-p2v-target/p2v-target.conf.in | 2 +- > > .../test/make_ramboot_initrd_test.py | 4 +- > > 4 files changed, 36 insertions(+), 3 deletions(-) > > create mode 100644 instance-p2v-target/fixes/fixlib/__init__.py > > create mode 100644 instance-p2v-target/hooks/install-fixes.in > > delete mode 100644 instance-p2v-target/scripts/__init__.py > > > > diff --git a/instance-p2v-target/fixes/fixlib/__init__.py > b/instance-p2v-target/fixes/fixlib/__init__.py > > new file mode 100644 > > index 0000000..2b122cf > > --- /dev/null > > +++ b/instance-p2v-target/fixes/fixlib/__init__.py > > @@ -0,0 +1,12 @@ > > +#!/usr/bin/python2.4 > > /usr/bin/python, not python2.4. > > > +# > > +# Copyright 2011 Google Inc. All Rights Reserved. > > I'm sure this is unintended :) >
Gah, yes, unintended. Proper headers coming soon. > > rest LGTM. > > thanks, > iustin >
