提交 c93125b1 编写于 作者: D Daniel P. Berrange

Move LXC driver into src/lxc/

* src/lxc_conf.c, src/lxc_conf.h, src/lxc_container.c,
  src/lxc_container.h, src/lxc_controller.c, src/lxc_driver.c,
  src/lxc_driver.h, src/veth.c, src/veth.h: Move to src/lxc/
* src/opennebula/one_driver.c: Remove bogus veth.h include
* src/Makefile.am: Adjust for lxc paths
* daemon/qemud.c: Adjust include for lxc
上级 f7a107f7
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
#include "qemu_driver.h" #include "qemu_driver.h"
#endif #endif
#ifdef WITH_LXC #ifdef WITH_LXC
#include "lxc_driver.h" #include "lxc/lxc_driver.h"
#endif #endif
#ifdef WITH_UML #ifdef WITH_UML
#include "uml_driver.h" #include "uml_driver.h"
......
...@@ -123,17 +123,17 @@ XEN_DRIVER_SOURCES += xen/xen_inotify.c xen/xen_inotify.h ...@@ -123,17 +123,17 @@ XEN_DRIVER_SOURCES += xen/xen_inotify.c xen/xen_inotify.h
endif endif
LXC_DRIVER_SOURCES = \ LXC_DRIVER_SOURCES = \
lxc_conf.c lxc_conf.h \ lxc/lxc_conf.c lxc/lxc_conf.h \
lxc_container.c lxc_container.h \ lxc/lxc_container.c lxc/lxc_container.h \
lxc_driver.c lxc_driver.h \ lxc/lxc_driver.c lxc/lxc_driver.h \
veth.c veth.h \ lxc/veth.c lxc/veth.h \
cgroup.c cgroup.h cgroup.c cgroup.h
LXC_CONTROLLER_SOURCES = \ LXC_CONTROLLER_SOURCES = \
lxc_conf.c lxc_conf.h \ lxc/lxc_conf.c lxc/lxc_conf.h \
lxc_container.c lxc_container.h \ lxc/lxc_container.c lxc/lxc_container.h \
lxc_controller.c \ lxc/lxc_controller.c \
veth.c veth.h \ lxc/veth.c lxc/veth.h \
cgroup.c cgroup.h cgroup.c cgroup.h
PHYP_DRIVER_SOURCES = \ PHYP_DRIVER_SOURCES = \
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include "memory.h" #include "memory.h"
#include "util.h" #include "util.h"
#include "bridge.h" #include "bridge.h"
#include "veth.h"
#define VIR_FROM_THIS VIR_FROM_ONE #define VIR_FROM_THIS VIR_FROM_ONE
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册