return
# the generic /etc/init.d/vinit script is permanently refreshed, and enabled
self.install_and_enable_vinit()
+ # expose .ssh for omf_friendly slivers
+ if 'omf_control' in self.rspec['tags']:
+ Account.mount_ssh_dir(self.name)
Sliver_Libvirt.start (self, delay)
# if a change has occured in the slice initscript, reflect this in /etc/init.d/vinit.slice
self.refresh_slice_vinit()
# pldistro = lxc
# fcdistro = squeeze
# arch x86_64
+
+ arch = 'x86_64'
+ tags = rec['rspec']['tags']
+ if 'arch' in tags:
+ arch = tags['arch']
+ if arch == 'i386':
+ arch = 'i686'
+
vref = rec['vref']
if vref is None:
logger.log('sliver_libvirt: %s: WARNING - no vref attached defaults to lxc-f14' % (name))
# subvolume)
command = ['btrfs', 'subvolume', 'snapshot', refImgDir, containerDir]
if not logger.log_call(command, timeout=15*60):
- logger.log('sliver_lxc: ERROR Could not create BTRFS snapshot at', containDir)
+ logger.log('sliver_lxc: ERROR Could not create BTRFS snapshot at', containerDir)
return
command = ['chmod', '755', containerDir]
logger.log_call(command, timeout=15*60)
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...
try:
with open(template_filename) as f:
template = Template(f.read())
- xml = template.substitute(name=name, interfaces=interfaces)
+ xml = template.substitute(name=name, xid=xid, interfaces=interfaces, arch=arch)
except IOError:
logger.log('Failed to parse or use XML template file %s'%template_filename)
return
@staticmethod
def destroy(name):
+ # umount .ssh directory - only if mounted
+ Account.umount_ssh_dir(name)
logger.verbose ('sliver_lxc: %s destroy'%(name))
conn = Sliver_Libvirt.getConnection(Sliver_LXC.TYPE)