Commit b13459fe authored by Leigh Stoller's avatar Leigh Stoller

Return image path in loadinfo. Version number bumped.

parent 493ce602
/* /*
* Copyright (c) 2000-2017 University of Utah and the Flux Group. * Copyright (c) 2000-2018 University of Utah and the Flux Group.
* *
* {{{EMULAB-LICENSE * {{{EMULAB-LICENSE
* *
...@@ -46,4 +46,4 @@ ...@@ -46,4 +46,4 @@
* it in clientside/tmcc/common/libsetup.pm! * it in clientside/tmcc/common/libsetup.pm!
*/ */
#define DEFAULT_VERSION 2 #define DEFAULT_VERSION 2
#define CURRENT_VERSION 42 #define CURRENT_VERSION 43
...@@ -6373,9 +6373,13 @@ COMMAND_PROTOTYPE(doloadinfo) ...@@ -6373,9 +6373,13 @@ COMMAND_PROTOTYPE(doloadinfo)
} }
} }
/* If this is a Docker vnode, hand back the path too. */ /*
if (reqp->isvnode && row[20] && row[20][0] * If this is a Docker vnode, hand back the path too.
&& strcmp("docker",row[20]) == 0) { * Updated for version 43, always return path.
*/
if (vers >= 43 ||
(reqp->isvnode && row[20] && row[20][0]
&& strcmp("docker",row[20]) == 0)) {
if (row[10]) if (row[10])
bufp += OUTPUT(bufp,ebufp - bufp, bufp += OUTPUT(bufp,ebufp - bufp,
" PATH=%s",row[10]); " PATH=%s",row[10]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment