From 5aba67f60ffd9676018e5dd41a016fb682064077 Mon Sep 17 00:00:00 2001
From: Krzysztof Dynowski <k.dynowski@samsung.com>
Date: Fri, 19 Jun 2015 14:49:30 +0200
Subject: [PATCH] Check vasum runtime - rename vasum-check-env to
 vasum-check-config

[Bug/Feature]   naming convention
[Cause]         N/A
[Solution]      rename
[Verification]  N/A

Change-Id: I6fb89a9378da7d4c04c0cae74935fdf67df5d3d6
---
 packaging/vasum.spec                                         | 2 +-
 server/CMakeLists.txt                                        | 2 +-
 server/scripts/{vasum-check-env.sh => vasum-check-config.sh} | 0
 server/server.cpp                                            | 8 ++++----
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename server/scripts/{vasum-check-env.sh => vasum-check-config.sh} (100%)

diff --git a/packaging/vasum.spec b/packaging/vasum.spec
index 83c5f0f..24c9842 100644
--- a/packaging/vasum.spec
+++ b/packaging/vasum.spec
@@ -45,7 +45,7 @@ between them. A process from inside a zone can request a switch of context
 %endif
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/vasum-server
-%attr(755,root,root) %{_sbindir}/vasum-check-env
+%attr(755,root,root) %{_sbindir}/vasum-check-config
 %dir /etc/vasum
 %dir /etc/vasum/templates
 %config /etc/vasum/daemon.conf
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index d5104db..b301d00 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -56,4 +56,4 @@ INSTALL(TARGETS ${SERVER_CODENAME} DESTINATION bin)
 ## Set capabilities on server executable #######################################
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND setcap CAP_SYS_ADMIN,CAP_MAC_OVERRIDE,CAP_SYS_TTY_CONFIG+ei \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/bin/${SERVER_CODENAME})")
 
-INSTALL(PROGRAMS "scripts/vasum-check-env.sh" DESTINATION sbin RENAME vasum-check-env)
+INSTALL(PROGRAMS "scripts/vasum-check-config.sh" DESTINATION sbin RENAME vasum-check-config)
diff --git a/server/scripts/vasum-check-env.sh b/server/scripts/vasum-check-config.sh
similarity index 100%
rename from server/scripts/vasum-check-env.sh
rename to server/scripts/vasum-check-config.sh
diff --git a/server/server.cpp b/server/server.cpp
index befb8da..1f749cc 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -163,7 +163,7 @@ bool Server::checkEnvironment()
         // control-group functionality was merged into kernel version 2.6.24 in 2007 (wikipedia)
         // namespace support begins from kernels 2.4.19(mnt), 2.6.19(ns,uts,ipc), 2.6.24(pid), 2.6.29(net)
         // namespace for usr from kernel 3.8(usr) - not used by vasum
-        std::cout << "kernel is old ver=" << u.release << ", run vasum-check-env" << std::endl;
+        std::cout << "kernel is old ver=" << u.release << ", run vasum-check-config" << std::endl;
         return false;
     }
     else
@@ -184,7 +184,7 @@ bool Server::checkEnvironment()
     std::string cgroupCheck = "/sys/fs/cgroup";
     int fd = ::open(cgroupCheck.c_str(), O_RDONLY);
     if (fd == -1) {
-        std::cout << "no cgroups support (can't access " << cgroupCheck << "), run vasum-check-env" << std::endl;
+        std::cout << "no cgroups support (can't access " << cgroupCheck << "), run vasum-check-config" << std::endl;
         return false;
     }
 
@@ -198,7 +198,7 @@ bool Server::checkEnvironment()
     }
     ::close(fd);
     if (err) {
-        std::cout << "cgroups problem, run vasum-check-env" << std::endl;
+        std::cout << "cgroups problem, run vasum-check-config" << std::endl;
         return false;
     }
     else
@@ -207,7 +207,7 @@ bool Server::checkEnvironment()
     // check namespaces
     std::string nsCheck = "/proc/self/ns";
     if (::access(nsCheck.c_str(), R_OK|X_OK)  == -1) {
-        std::cout << "no namespace support (can't access " << nsCheck << "), run vasum-check-env" << std::endl;
+        std::cout << "no namespace support (can't access " << nsCheck << "), run vasum-check-config" << std::endl;
         return false;
     }
     else
-- 
2.7.4