From a23ac00a3c74fc57b11a1ba9a36adb138a206498 Mon Sep 17 00:00:00 2001 From: "kj7.sung" Date: Thu, 30 Jun 2016 17:47:37 +0900 Subject: [PATCH] 1. Changed to non-root daemon 2. shell script path Change-Id: Ic29056cfcee4925eb6b271e7ce2a799a997f9f84 Signed-off-by: kj7.sung --- lbs-server/org.tizen.lbs.Providers.LbsServer.service.in | 4 ++-- lbs-server/script/dump_gps.sh | 1 + lbs-server/script/dump_lbs.sh | 14 -------------- lbs-server/script/lbs-server | 1 + packaging/lbs-server.changes | 10 ++++++++-- packaging/lbs-server.service | 4 ++-- packaging/lbs-server.spec | 2 +- 7 files changed, 15 insertions(+), 21 deletions(-) delete mode 100755 lbs-server/script/dump_lbs.sh diff --git a/lbs-server/org.tizen.lbs.Providers.LbsServer.service.in b/lbs-server/org.tizen.lbs.Providers.LbsServer.service.in index 5dffca4..fd6b952 100644 --- a/lbs-server/org.tizen.lbs.Providers.LbsServer.service.in +++ b/lbs-server/org.tizen.lbs.Providers.LbsServer.service.in @@ -1,6 +1,6 @@ [D-BUS Service] Name=org.tizen.lbs.Providers.LbsServer Exec=/bin/false -User=root -Group=root +User=location +Group=location SystemdService=lbs-server.service diff --git a/lbs-server/script/dump_gps.sh b/lbs-server/script/dump_gps.sh index ee1b6c9..238e52e 100755 --- a/lbs-server/script/dump_gps.sh +++ b/lbs-server/script/dump_gps.sh @@ -1,4 +1,5 @@ #!/bin/sh +PATH=/bin:/usr/bin:/sbin:/usr/sbin #-------------------------------------- # GPS diff --git a/lbs-server/script/dump_lbs.sh b/lbs-server/script/dump_lbs.sh deleted file mode 100755 index b49613c..0000000 --- a/lbs-server/script/dump_lbs.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -#-------------------------------------- -# GPS -#-------------------------------------- - -GPS_DEBUG_DIR=$1/lbs_server -mkdir -p ${GPS_DEBUG_DIR} - -cp /tmp/dump_lbs.log ${GPS_DEBUG_DIR}/ - -vconftool get memory/location/gps >> ${GPS_DEBUG_DIR}/vconf -vconftool get memory/location/wps >> ${GPS_DEBUG_DIR}/vconf -vconftool get db/location/setting >> ${GPS_DEBUG_DIR}/vconf diff --git a/lbs-server/script/lbs-server b/lbs-server/script/lbs-server index cf84717..721c09c 100644 --- a/lbs-server/script/lbs-server +++ b/lbs-server/script/lbs-server @@ -1,4 +1,5 @@ #!/bin/sh +PATH=/bin:/usr/bin:/sbin:/usr/sbin ##/etc/init.d/lbs-server Lv : S90 ## This file is boot script of /usr/bin/lbs-server diff --git a/packaging/lbs-server.changes b/packaging/lbs-server.changes index 4e3e01f..e5e1386 100644 --- a/packaging/lbs-server.changes +++ b/packaging/lbs-server.changes @@ -1,12 +1,18 @@ +[Version] lbs-server_1.0.4 +[Date] 30 Jun 2016 +[Changes] Change to non-root daemon. +[Developer] Kyoungjun Sung + +================================================================================ [Version] lbs-server_1.0.3 [Date] 9 Jun 2016 -[Problem] Smack capability removed. +[Changes] Smack capability removed. [Developer] Kyoungjun Sung ================================================================================ [Version] lbs-server_1.0.2 [Date] 3 Jun 2016 -[Problem] Change service state behavior when WPS searching mode. +[Changes] Change service state behavior when WPS searching mode. [Developer] Kyoungjun Sung ================================================================================ diff --git a/packaging/lbs-server.service b/packaging/lbs-server.service index 6c569ca..f63d29e 100644 --- a/packaging/lbs-server.service +++ b/packaging/lbs-server.service @@ -6,8 +6,8 @@ Description=lbs server daemon #ExecStart=/etc/rc.d/rc5.d/S90lbs-server ExecStart=/usr/bin/lbs-server MemoryLimit=10M -User=root -Group=root +User=location +Group=location CapabilityBoundingSet=~CAP_MAC_ADMIN CapabilityBoundingSet=~CAP_MAC_OVERRIDE diff --git a/packaging/lbs-server.spec b/packaging/lbs-server.spec index 7fac989..be31328 100644 --- a/packaging/lbs-server.spec +++ b/packaging/lbs-server.spec @@ -1,6 +1,6 @@ Name: lbs-server Summary: LBS Server for Tizen -Version: 1.0.3 +Version: 1.0.4 Release: 1 Group: Location/Service License: Apache-2.0 -- 2.7.4