Remove default manifest

Change-Id: I64f56020d7efbd77551094dc4ea0e1d3d84c2da7
Signed-off-by: Jaemin Ryu <jm77.ryu@samsung.com>

diff --git a/module/krate-builder.cpp b/module/krate-builder.cpp
index 9a568b7a8954283cb3e59e3b28f51f67e5046ed5..b50e3b6b2f4bfb3f680ae7a4ae83617dfcb520ed 100644 (file)
--- a/module/krate-builder.cpp
+++ b/module/krate-builder.cpp
@@ -27,7 +27,10 @@
 KrateBuilder::KrateBuilder(const runtime::User& user, const std::string& manifestPath) :
        name(user.getName()), uid(user.getUid()), gid(user.getGid())
 {
-       manifest.reset(xml::Parser::parseFile(manifestPath));
+       runtime::File data(manifestPath);
+       if (data.exists()) {
+               manifest.reset(xml::Parser::parseFile(manifestPath));
+       }
 }
 
 KrateBuilder::~KrateBuilder()
@@ -61,13 +64,14 @@ void KrateBuilder::unshareNamespace()
        }
 }
 
-void KrateBuilder::mountOwnFilesystem() {
-       manifest.reset(xml::Parser::parseFile("/opt/etc/krate/owner.xml"));
-
-       xml::Node::NodeList entries = manifest->evaluate("/manifest/filesystem/entry");
-       for (const xml::Node& entry : entries) {
-               bindFilesystemNode(entry.getProp("source"), entry.getProp("target"),
-                                                  entry.getProp("type"), entry.getProp("options"));
+void KrateBuilder::mountOwnFilesystem()
+{
+       if (manifest.get()) {
+               xml::Node::NodeList entries = manifest->evaluate("/manifest/filesystem/entry");
+               for (const xml::Node& entry : entries) {
+                       bindFilesystemNode(entry.getProp("source"), entry.getProp("target"),
+                                                          entry.getProp("type"), entry.getProp("options"));
+               }
        }
 
        bindFilesystemNode("/home/" + name,

diff --git a/packaging/krate.spec b/packaging/krate.spec
index ab57878e58c001d8c6b264df28d57fed4bba9d19..62c6508d71c12d782931872660b4aaaf691c322e 100644 (file)
--- a/packaging/krate.spec
+++ b/packaging/krate.spec
@@ -38,13 +38,10 @@ krates.
 %attr(700,root,root) %{_sbindir}/krate-volume-manager
 %{_unitdir}/krate.service
 %{_unitdir}/multi-user.target.wants/krate.service
-%attr(700,root,root) /etc/gumd/useradd.d/20_krate-add.post
-%attr(700,root,root) /etc/gumd/userdel.d/20_krate-remove.post
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/shortcut_icon.png
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/indicator_icon.png
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/notification_sub_icon.png
-%attr(700,root,root) %dir %{TZ_SYS_ETC}/krate
-%attr(600,root,root) %config %{TZ_SYS_ETC}/krate/owner.xml
+#%attr(700,root,root) %dir %{TZ_SYS_ETC}/krate
 %attr(755,root,root) %{_libdir}/security/pam_krate.so
 %attr(700,root,root) %{_sbindir}/krate-admin-cli
 %config /etc/pam.d/*

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index c8aba950ae3e062ed524482b037c42e269c0df82..c973a823ff2fa9d577c33872700ab61caef7ff76 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -65,10 +65,6 @@ CONFIGURE_FILE(systemd/krate.service.in systemd/krate.service)
 INSTALL(TARGETS ${SERVER_NAME} DESTINATION ${BIN_DIR})
 INSTALL(FILES systemd/krate.service DESTINATION ${SYSTEMD_UNIT_DIR})
 
-INSTALL(FILES ${KRATE_TOOLS}/gumd-scripts/20_krate-add.post DESTINATION /etc/gumd/useradd.d)
-INSTALL(FILES ${KRATE_TOOLS}/gumd-scripts/20_krate-remove.post DESTINATION /etc/gumd/userdel.d)
-
-INSTALL(FILES ${KRATE_DATA}/DefaultManifest.xml DESTINATION ${CONF_DIR} RENAME owner.xml)
 INSTALL(FILES ${KRATE_DATA}/indicator_icon.png DESTINATION ${ICON_DIR})
 INSTALL(FILES ${KRATE_DATA}/notification_sub_icon.png DESTINATION ${ICON_DIR})
 INSTALL(FILES ${KRATE_DATA}/shortcut_icon.png DESTINATION ${ICON_DIR})

diff --git a/tools/gumd-scripts/20_krate-add.post b/tools/gumd-scripts/20_krate-add.post
deleted file mode 100644 (file)
index fcaf715..0000000
--- a/tools/gumd-scripts/20_krate-add.post
+++ /dev/null
@@ -1,4 +0,0 @@
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-export `tzplatform-get TZ_SYS_ETC`
-cp ${TZ_SYS_ETC}/krate/owner.xml ${TZ_SYS_ETC}/krate/${1}.xml

diff --git a/tools/gumd-scripts/20_krate-remove.post b/tools/gumd-scripts/20_krate-remove.post
deleted file mode 100644 (file)
index 73112eb..0000000
--- a/tools/gumd-scripts/20_krate-remove.post
+++ /dev/null
@@ -1,4 +0,0 @@
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-export `tzplatform-get TZ_SYS_ETC`
-rm ${TZ_SYS_ETC}/krate/${1}.xml