summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDariusz Michaluk <d.michaluk@samsung.com>2013-06-13 13:16:14 +0200
committerDariusz Michaluk <d.michaluk@samsung.com>2013-07-04 09:15:41 +0200
commit5775eb97043dcb47058a555960b5942674a0aad9 (patch)
tree77d518da8e2437eb5f527b0e28b9eb451bd82045
parent9a40b73c23ed55b7cad5a3ceddecbd158f3cffc0 (diff)
downloadsecure-storage-5775eb97043dcb47058a555960b5942674a0aad9.tar.gz
secure-storage-5775eb97043dcb47058a555960b5942674a0aad9.tar.bz2
secure-storage-5775eb97043dcb47058a555960b5942674a0aad9.zip
Remove init scripts
Change-Id: Idac98cbe97bdcc8c95a65204eb978ecff27c5bf4
-rw-r--r--CMakeLists.txt1
-rwxr-xr-xpackaging/secure-storage.spec8
-rwxr-xr-xss-server.manifest3
-rwxr-xr-xss-serverd4
4 files changed, 0 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ea168d..d6c395d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,5 @@ INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/ss-server DESTINATION bin)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/secure-storage.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config DESTINATION share/secure-storage/)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/ss_manager.h DESTINATION include)
-INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/ss-serverd DESTINATION /etc/rc.d/init.d)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/secure-storage.service DESTINATION /usr/lib/systemd/system)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/secure-storage.socket DESTINATION /usr/lib/systemd/system)
diff --git a/packaging/secure-storage.spec b/packaging/secure-storage.spec
index 22e8950..0b77adf 100755
--- a/packaging/secure-storage.spec
+++ b/packaging/secure-storage.spec
@@ -62,11 +62,6 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/sockets.target.wants
ln -s ../secure-storage.service %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/secure-storage.service
ln -s ../secure-storage.socket %{buildroot}%{_prefix}/lib/systemd/system/sockets.target.wants/secure-storage.socket
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d
-ln -s ../init.d/ss-serverd %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S40ss-server
-ln -s ../init.d/ss-serverd %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S40ss-server
-
mkdir -p %{buildroot}/usr/share/license
cp LICENSE.APLv2 %{buildroot}/usr/share/license/ss-server
cp LICENSE.APLv2 %{buildroot}/usr/share/license/libss-client
@@ -92,9 +87,6 @@ systemctl daemon-reload
%files -n ss-server
%manifest ss-server.manifest
%defattr(-,root,root,-)
-%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/ss-serverd
-%{_sysconfdir}/rc.d/rc3.d/S40ss-server
-%{_sysconfdir}/rc.d/rc5.d/S40ss-server
%{_bindir}/ss-server
%{_prefix}/lib/systemd/system/secure-storage.service
%{_prefix}/lib/systemd/system/multi-user.target.wants/secure-storage.service
diff --git a/ss-server.manifest b/ss-server.manifest
index c885b77..970f6f7 100755
--- a/ss-server.manifest
+++ b/ss-server.manifest
@@ -14,8 +14,5 @@
<domain name="secure-storage"/>
</request>
<assign>
- <filesystem path="/etc/rc.d/init.d/ss-serverd" label="_" exec_label="none" />
- <filesystem path="/etc/rc.d/rc3.d/S40ss-server" label="_" exec_label="none" />
- <filesystem path="/etc/rc.d/rc5.d/S40ss-server" label="_" exec_label="none" />
</assign>
</manifest>
diff --git a/ss-serverd b/ss-serverd
deleted file mode 100755
index 79132e9..0000000
--- a/ss-serverd
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# start secure-storage server
-/usr/bin/ss-server &