summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn L. Whiteman <john.l.whiteman@intel.com>2014-10-27 07:14:01 -0700
committerJohn L. Whiteman <john.l.whiteman@intel.com>2014-10-27 07:16:06 -0700
commit8e5c4dc0f1b514a945d0972d701a618e462f7adf (patch)
tree7fd25c0570536fb189fc6770945bf7a8506554fc
parent7528a937164e602617ee979cbcf86ac9fa46d347 (diff)
downloadsecure-storage-8e5c4dc0f1b514a945d0972d701a618e462f7adf.tar.gz
secure-storage-8e5c4dc0f1b514a945d0972d701a618e462f7adf.tar.bz2
secure-storage-8e5c4dc0f1b514a945d0972d701a618e462f7adf.zip
Change-Id: I30be2aae55e15767cad5cb5356a2b03e1e859bad Signed-off-by: John L. Whiteman <john.l.whiteman@intel.com>
-rw-r--r--[-rwxr-xr-x]NOTICE0
-rwxr-xr-xinclude/secure_storage.h2
-rw-r--r--packaging/secure-storage.changes3
-rw-r--r--[-rwxr-xr-x]packaging/secure-storage.spec2
-rw-r--r--[-rwxr-xr-x]ss-server.manifest0
5 files changed, 6 insertions, 1 deletions
diff --git a/NOTICE b/NOTICE
index 0e0f016..0e0f016 100755..100644
--- a/NOTICE
+++ b/NOTICE
diff --git a/include/secure_storage.h b/include/secure_storage.h
index 67ff3d0..2749b62 100755
--- a/include/secure_storage.h
+++ b/include/secure_storage.h
@@ -34,7 +34,7 @@
#define MAX_GROUP_ID_LEN 32
#define MAX_COOKIE_LEN 20
-#define SS_STORAGE_DEFAULT_PATH "/opt/share/secure-storage/"
+#define SS_STORAGE_DEFAULT_PATH "/usr/share/secure-storage/"
/* using dlog */
#ifdef SS_DLOG_USE
diff --git a/packaging/secure-storage.changes b/packaging/secure-storage.changes
new file mode 100644
index 0000000..7ecf007
--- /dev/null
+++ b/packaging/secure-storage.changes
@@ -0,0 +1,3 @@
+* Mon Oct 27 2014 John L. Whiteman <john.l.whiteman@intel.com> accepted/tizen/ivi/panda/20140403.015004-2-g35c2a1a
+- Fixed TC-1738. ss-server service does not start
+
diff --git a/packaging/secure-storage.spec b/packaging/secure-storage.spec
index e8bd09a..171149d 100755..100644
--- a/packaging/secure-storage.spec
+++ b/packaging/secure-storage.spec
@@ -73,11 +73,13 @@ cp LICENSE.APLv2 %{buildroot}/usr/share/license/libss-client
%preun -n ss-server
if [ $1 == 0 ]; then
systemctl stop secure-storage.service
+ systemctl disable secure-storage.service -q
fi
%post -n ss-server
systemctl daemon-reload
if [ $1 == 1 ]; then
+ systemctl enable secure-storage.service -q
systemctl restart secure-storage.service
fi
diff --git a/ss-server.manifest b/ss-server.manifest
index 97e8c31..97e8c31 100755..100644
--- a/ss-server.manifest
+++ b/ss-server.manifest