From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 17 May 2013 09:58:41 +0000 (+0200)
Subject: add /bin and /sbin in path if not present in slivers - in root/.profile like for... 
X-Git-Tag: nodemanager-5.2-3~2
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=931588ce80de75383b980a3eab806a60396364ba

add /bin and /sbin in path if not present in slivers - in root/.profile like for LD_PRELOAD
---

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 96b757f..f701964 100644
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -97,10 +97,27 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
         ld_preload_msg="""# by default, we define this setting so that calls to bind(2),
 # when invoked on 0.0.0.0, get transparently redirected to the public interface of this node
 # see https://svn.planet-lab.org/wiki/LxcPortForwarding"""
+        usrmove_path_msg="""# VM's before Features/UsrMove need /bin and /sbin in their PATH"""
+        usrmove_path_code="""
+pathmunge () {
+        if ! echo $PATH | /bin/egrep -q "(^|:)$1($|:)" ; then
+           if [ "$2" = "after" ] ; then
+              PATH=$PATH:$1
+           else
+              PATH=$1:$PATH
+           fi
+        fi
+}
+pathmunge /bin after
+pathmunge /sbin after
+unset pathmunge
+"""
         with open(dot_profile,'w') as f:
             f.write("export PS1='%s@\H \$ '\n"%(name))
             f.write("%s\n"%ld_preload_msg)
             f.write("export LD_PRELOAD=/etc/planetlab/lib/bind_public.so\n")
+            f.write("%s\n"%usrmove_path_msg)
+            f.write("%s\n"%usrmove_path_code)
 
         # TODO: set quotas...