# 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...
logger.log("uid is %d" % uid)
command = ['mkdir', '%s/home/%s' % (containerDir, name)]
logger.log_call(command, timeout=10)
+ command = ['chown', name, '%s/home/%s' % (containerDir, name)]
+ logger.log_call(command, timeout=10)
etcpasswd = os.path.join(containerDir, 'etc/passwd')
if os.path.exists(etcpasswd):
logger.log("adding user %s id %d to %s" % (name, uid, etcpasswd))
- file(etcpasswd,'a').write("%s:x:%d:%d::/home/%s:/bin/bash\n" % (name, uid, uid, name))
+ try:
+ file(etcpasswd,'a').write("%s:x:%d:%d::/home/%s:/bin/bash\n" % (name, uid, uid, name))
+ except:
+ logger.log_exc("exception while updating etc/passwd")
+ sudoers = os.path.join(containerDir, 'etc/sudoers')
+ if os.path.exists(sudoers):
+ try:
+ file(sudoers,'a').write("%s ALL=(ALL) NOPASSWD: ALL\n" % name)
+ except:
+ logger.log_exc("exception while updating /etc/sudoers")
# Lookup for xid and create template after the user is created so we
# can get the correct xid based on the name of the slice
try:
with open(template_filename) as f:
template = Template(f.read())
- xml = template.substitute(name=name, interfaces=interfaces)
+ xml = template.substitute(name=name, interfaces=interfaces, arch=arch)
except IOError:
logger.log('Failed to parse or use XML template file %s'%template_filename)
return