From: YoungHun Kim Date: Tue, 2 Jun 2020 02:32:29 +0000 (+0900) Subject: Create /tmp/.mm-res-mgr.fifo using tmpfile.d conf for smack labeling X-Git-Tag: accepted/tizen/5.5/unified/20200605.085934~2^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99274d53346d79efdc203f370a7b736f61ac6834;p=platform%2Fcore%2Fmultimedia%2Fmm-resource-manager.git Create /tmp/.mm-res-mgr.fifo using tmpfile.d conf for smack labeling Change-Id: I34afa7ed888e775d7ea1698a28f0de542e71ae5c --- diff --git a/packaging/mm-resource-manager.conf b/packaging/mm-resource-manager.conf new file mode 100644 index 0000000..03d09ed --- /dev/null +++ b/packaging/mm-resource-manager.conf @@ -0,0 +1,2 @@ +p /tmp/.mm-res-mgr.fifo 0666 multimedia_fw multimedia_fw - - +t /tmp/.mm-res-mgr.fifo - - - - security.SMACK64="User::App::Shared" diff --git a/packaging/mm-resource-manager.spec b/packaging/mm-resource-manager.spec index 0be7672..db29601 100644 --- a/packaging/mm-resource-manager.spec +++ b/packaging/mm-resource-manager.spec @@ -8,6 +8,7 @@ URL: http://source.tizen.org Source0: %{name}-%{version}.tar.gz Source1: mm-resource-managerd.service Source2: org.tizen.MMResourceManager.conf +Source1000: mm-resource-manager.conf Source1001: mm-resource-manager.manifest BuildRequires: cmake BuildRequires: pkgconfig(dlog) @@ -19,6 +20,7 @@ BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(murphy-resource) BuildRequires: pkgconfig(murphy-glib) BuildRequires: pkgconfig(iniparser) +BuildRequires: pkgconfig(libsystemd) %description A Multimedia Resource Manager library. @@ -60,6 +62,8 @@ make %{?jobs:-j%jobs} %install rm -rf %{buildroot} +mkdir -p %{buildroot}%{_tmpfilesdir} +install -m 0644 %SOURCE1000 %{buildroot}%{_tmpfilesdir}/%{name}.conf mkdir -p %{buildroot}%{_datadir}/license mkdir -p %{buildroot}%{_bindir} cp test/mm_res_manager_test %{buildroot}%{_bindir} @@ -81,6 +85,7 @@ cp %SOURCE2 %{buildroot}%{_sysconfdir}/dbus-1/system.d %manifest %{name}.manifest %license LICENSE.APLv2 %{_libdir}/lib%{name}.so.* +%{_tmpfilesdir}/%{name}.conf %{_bindir}/* %{_unitdir}/mm-resource-managerd.service %{_unitdir}/multi-user.target.wants/mm-resource-managerd.service diff --git a/packaging/mm-resource-managerd.service b/packaging/mm-resource-managerd.service index 7edcd7b..ea89b9d 100644 --- a/packaging/mm-resource-managerd.service +++ b/packaging/mm-resource-managerd.service @@ -1,7 +1,7 @@ [Unit] Description=Multimedia Resource Manager Requires=murphyd.service -After=murphyd.service dbus.service +After=murphyd.service dbus.service systemd-tmpfiles-setup.service [Service] Type=forking diff --git a/src/daemon/mm_resource_manager_daemon_priv.c b/src/daemon/mm_resource_manager_daemon_priv.c index 04b1b07..dadd543 100644 --- a/src/daemon/mm_resource_manager_daemon_priv.c +++ b/src/daemon/mm_resource_manager_daemon_priv.c @@ -102,10 +102,8 @@ static gboolean __wait_for_release_cb_sync(mm_resource_manager_id id); gboolean _mmrm_dmn_init(void) { - unlink(RELEASE_CB_SYNC_PATH); - MM_RM_RETVM_IF(mkfifo(RELEASE_CB_SYNC_PATH, - S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH) == -1, FALSE, - "Release callback sync cannot be created"); + MM_RM_RETVM_IF(access(RELEASE_CB_SYNC_PATH, F_OK) != 0, FALSE, + "systemd-tmpfiles-setup.service can't create %s", RELEASE_CB_SYNC_PATH); MM_RM_RETVM_IF(mm_resource_manager_backend_init() != MM_RESOURCE_MANAGER_ERROR_NONE, FALSE, @@ -124,7 +122,7 @@ gboolean _mmrm_dmn_init(void) return TRUE; } -gboolean _mmrm_dmn_deinit() +gboolean _mmrm_dmn_deinit(void) { int i;