shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-08 21:17:43 +03:00
Code Releases Wiki Activity

F #1684: LXD fix (#2688)

Browse Source
This commit is contained in:
Daniel Clavijo Coca 2018-12-10 10:25:45 -06:00 committed by Ruben S. Montero
parent 969ddc00c4
commit a61da0f322
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -33,6 +33,7 @@ Additionally, to build OpenNebula from source you need:
* **flex** >= 2.5 (optional, only needed to rebuild the parsers)
* **bison** >= 2.3 (optional, only needed to rebuild the parsers)
* **libxml2-dev**
* **libvncserver-dev** (optional, only needed to build svncterm_server)
### Ruby Libraries Requirements
@ -115,6 +116,7 @@ The argument expression *[OPTIONAL]* is used to set non-default values for:
new_xmlrpc yes if you have an xmlrpc-c version >= 1.31
sunstone yes if you want to build sunstone minified files
systemd yes if you want to build systemd support
svncterm no if you want to skip building vnc support for LXD drivers
### Installation

2
src/vmm_mad/remotes/lib/lxd/container.rb
View File

@ -305,7 +305,7 @@ class Container
update
mapper = new_disk_mapper(@one, disk_element)
mapper = new_disk_mapper(disk_element)
mapper.unmap(@one, disk_element, csrc)
end

2
src/vmm_mad/remotes/lib/lxd/opennebula-lxd
View File

@ -18,5 +18,5 @@
# This file is meant for allow oneadmin to run the following commands as root
#
Cmnd_Alias ONE_MAPPER = /bin/lsblk, /sbin/losetup, /bin/mount, /bin/umount, /sbin/kpartx, /usr/bin/qemu-nbd, /bin/mkdir, /usr/bin/catfstab, /sbin/e2fsck, /sbin/resize2fs, /usr/sbin/xfs_growfs, /usr/bin/rbd
Cmnd_Alias ONE_MAPPER = /bin/lsblk, /sbin/losetup, /bin/mount, /bin/umount, /sbin/kpartx, /usr/bin/qemu-nbd, /bin/mkdir, /usr/bin/catfstab, /sbin/blkid /sbin/e2fsck, /sbin/resize2fs, /usr/sbin/xfs_growfs, /usr/bin/rbd
oneadmin ALL=(ALL:ALL) NOPASSWD: ONE_MAPPER

2
src/vmm_mad/remotes/lib/lxd/opennebula_vm.rb
View File

@ -335,7 +335,7 @@ class OpenNebulaVM
# Creates or closes a connection to a container rfb port depending on signal
def vnc_command(signal)
data = @xml.element('//TEMPLATE/GRAPHICS')
return unless data && data['PORT'] && data['TYPE'] == 'VNC'
return unless data && data['PORT'] && data['TYPE'] == 'vnc'
pass = data['PASSWD']
pass = '-' unless pass && !pass.empty?

7
src/vmm_mad/remotes/lib/lxd/svncterm_server/SConstruct
View File

@ -19,13 +19,14 @@ import os
env = Environment()
env['LIBS'] = ['-lz']
env['CFLAGS'] = ['-std=c99', '-Wall']
env.Program('genfont.c')
env = Environment()
env['LIBS'] = ['-lvncserver', '-lnsl', '-lpthread', '-lz', '-ljpeg',
'-lutil', '-lgnutls']
env['LIBS'] = ['-lvncserver', '-lnsl', '-lpthread', '-lz', '-ljpeg',
'-lutil', '-lgnutls']
env['CFLAGS'] = ['-D_GNU_SOURCE']
env['CFLAGS'] = ['-D_GNU_SOURCE', '-std=c99', '-Wall']
env.Program('svncterm_server.c')

2
src/vmm_mad/remotes/lib/lxd/svncterm_server/genfont.c
View File

@ -33,6 +33,8 @@
#include <stdlib.h>
#include <zlib.h>
#include <string.h>
#include <linux/limits.h>
#include <getopt.h>
/* -------------------------------------------------------------------------- */
/* Font glyph storage array and map pointer */