On Fri, May 24, 2013 at 10:10 AM, Dimitris Aragiorgis <[email protected]>wrote:
> Hi from Athens again! > > Have you forgotten to cc the list? Anyway I continue offline.. > > Indeed, I did. +list, sorry. > * Guido Trotter <[email protected]> [2013-05-21 15:11:50 +0200]: > > > On Sat, May 18, 2013 at 3:17 AM, Dimitris Aragiorgis <[email protected] > >wrote: > > > > > Add new script vif-ganeti that could be used instead of > > > default vif-bridge in order NIC customization can be more > > > flexible. > > > > > > Extract common code from kvm-ifup and insert it in a new > > > file net-common that is being sourced by kvm-ifup and > > > vif-ganeti and located under package lib dir (/usr/lib/ganeti/). > > > > > > > > If this is under tools/ can we also install it in /usr/lib/ganeti/tools ? > > > > > > Well I don't think these scripts are tools. I put it in /usr/lib/ganeti > because kvm-ifup is located under that dir as well. > > Ah, sounds good then, thanks. > > > TODO: in debian/links add the following symbolic link; > > > /etc/xen/scripts/vif-ganeti ->/usr/lib/ganeti/vif-ganeti. > > > This is needed because Xen expects network related scripts > > > to be located under /etc/xen/scripts. > > > > > > Signed-off-by: Dimitris Aragiorgis <[email protected]> > > > > > > > Can we add the link at "make install" time? Why should it be done in > > debian/links? > > > > Good point. How about that interdiff: > > diff --git a/Makefile.am b/Makefile.am > index 9133a8b..08d3dc8 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -791,7 +791,12 @@ qa_scripts = \ > bin_SCRIPTS = > if WANT_HTOOLS > bin_SCRIPTS += $(HS_BIN_PROGS) > +endif > install-exec-hook: > + @mkdir_p@ "$(DESTDIR)${sysconfdir}/xen/scripts" > + $(LN_S) -f "$(DESTDIR)${myexeclibdir}/vif-ganeti" \ > + "$(DESTDIR)${sysconfdir}/xen/scripts/vif-ganeti" > I was not sure we should forcibly create /etc/xen, and whether it should it be ${sysconfdir} considering that the default for sysconfdir is /usr/local/etc (ew...). But perhaps it's the best option, anyway. > +if WANT_HTOOLS > @mkdir_p@ $(DESTDIR)$(iallocatorsdir) > # FIXME: this is a hardcoded logic, instead of auto-resolving > $(LN_S) -f ../../../bin/htools \ > > > Do you agree with the rest? > > Yes, I believe so. Can you please do a resend, so I can look at it as a whole and apply? Thanks, Guido
