Fix configuration script permissions

[Feature]       N/A
[Cause]         N/A
[Solution]      LXC templates have x permission
[Verification]  Build, run all tests

Change-Id: I6a2486a588f8a28dfe84f187a4889f0f9500e2a6

diff --git a/server/configs/CMakeLists.txt b/server/configs/CMakeLists.txt
index 0e7be41..278a9fc 100644 (file)
--- a/server/configs/CMakeLists.txt
+++ b/server/configs/CMakeLists.txt
@@ -19,8 +19,8 @@
 
 MESSAGE(STATUS "Installing configs to " ${VSM_CONFIG_INSTALL_DIR})
 
-FILE(GLOB template_CONF      templates/*.conf
-                             templates/*.sh)
+FILE(GLOB zone_templates_CONF  templates/*.conf)
+FILE(GLOB lxc_templates_CONF   templates/*.sh)
 
 ## Generate ####################################################################
 CONFIGURE_FILE(systemd/vasum.service.in
@@ -43,7 +43,10 @@ INSTALL(FILES       ${CMAKE_BINARY_DIR}/dbus-1/system.d/org.tizen.vasum.host.con
 
 INSTALL(DIRECTORY   DESTINATION ${VSM_CONFIG_INSTALL_DIR}/zones) #TODO temporary solution
 
-INSTALL(PROGRAMS    ${template_CONF}
+INSTALL(FILES       ${zone_templates_CONF}
+        DESTINATION ${VSM_CONFIG_INSTALL_DIR}/templates)
+
+INSTALL(PROGRAMS    ${lxc_templates_CONF}
         DESTINATION ${VSM_CONFIG_INSTALL_DIR}/templates)
 
 INSTALL(FILES

diff --git a/tests/unit_tests/configs/CMakeLists.txt b/tests/unit_tests/configs/CMakeLists.txt
index 04aabda..a18914e 100644 (file)
--- a/tests/unit_tests/configs/CMakeLists.txt
+++ b/tests/unit_tests/configs/CMakeLists.txt
@@ -20,8 +20,8 @@
 MESSAGE(STATUS "Installing configs for the Unit Tests to " ${VSM_TEST_CONFIG_INSTALL_DIR})
 
 FILE(GLOB ut_zone_CONF            *.conf)
-FILE(GLOB ut_zone_templates_CONF  templates/*.conf
-                                  templates/*.sh)
+FILE(GLOB ut_zone_templates_CONF  templates/*.conf)
+FILE(GLOB ut_lxc_templates_CONF   templates/*.sh)
 
 ## Generate ####################################################################
 CONFIGURE_FILE(test-daemon.conf.in
@@ -44,6 +44,9 @@ INSTALL(FILES        ${ut_zone_templates_CONF}
                      ${ut_zone_templates_CONF_GEN}
         DESTINATION  ${VSM_TEST_TEMPLATES_INSTALL_DIR})
 
+INSTALL(PROGRAMS     ${ut_lxc_templates_CONF}
+        DESTINATION  ${VSM_TEST_TEMPLATES_INSTALL_DIR})
+
 INSTALL(FILES        dbus/ut-dbus.conf
                      dbus/ut-dbus-system.conf
         DESTINATION  ${VSM_TEST_CONFIG_INSTALL_DIR}/dbus)