Re: stable / unstable parallel install?

[aq <aquynh@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 775 bytes --]

On 5/31/05, Keir Fraser <Keir.Fraser@cl.cam.ac.uk> wrote:
> 
> On 30 May 2005, at 17:00, aq wrote:
> 
> > yes, that is the case, since in /usr/sbin/xend, we have:
> >
> > XCS_EXEC    = "/usr/sbin/xcs"
> >
> > should we execute xcs without the full path?
> 
> Perhaps best would be to try with no path, and fall back to
> /usr/sbin/xcs. I'd definitely take a tested patch to that effect (for
> both -testing and -unstable).
> 

Keir, there is no xcs in -testing.

Here is the patch: it tries to execute xcs without full path first,
then if there is error, it fallbacks to the default path.

Signed-off-by: Nguyen Anh Quynh <aquynh@gmail.com>

$ diffstat xcs_nopath.diff 
 xend |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: xcs_nopath.diff --]
[-- Type: text/x-patch; name="xcs_nopath.diff", Size: 1486 bytes --]

===== tools/misc/xend 1.23 vs edited =====
--- 1.23/tools/misc/xend	2005-05-25 03:53:31 +09:00
+++ edited/tools/misc/xend	2005-06-01 16:25:06 +09:00
@@ -27,8 +27,10 @@
 
 XCS_PATH    = "/var/lib/xen/xcs_socket"
 XCS_EXEC    = "/usr/sbin/xcs"
+XCS_NP_EXEC = "xcs"    # xcs with no path
 XCS_PIDFILE = "/var/run/xcs.pid"
 XCS_ARGS    = (XCS_EXEC, "-p", XCS_PIDFILE)
+XCS_NP_ARGS = (XCS_NP_EXEC, "-p", XCS_PIDFILE)   # execute xcs with no path
 
 # add fallback path for non-native python path installs if needed
 sys.path.append('/usr/lib/python')
@@ -92,12 +94,15 @@
             if not os.path.isdir(os.path.dirname(XCS_PATH)):
                 os.makedirs(os.path.dirname(XCS_PATH))
             try:
-                os.execvp(XCS_EXEC, XCS_ARGS)
+                os.execvp(XCS_NP_EXEC, XCS_NP_ARGS) # execute xcs with no path
             except:
-                hline()
-                msg("Tried to start xcs, but failed. Is it installed?")
-                hline()
-                raise CheckError("couldn't start xcs")
+                try:
+                    os.execv(XCS_EXEC, XCS_ARGS)    # fallback to execute xcs in default path
+                except:
+                    hline()
+                    msg("Tried to start xcs, but failed. Is it installed?")
+                    hline()
+                    raise CheckError("couldn't start xcs")
         if (not xcs_running()):
             hline()
             msg("Failed to start the control interface switch.")

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel