From: hyunuktak <hyunuk.tak@samsung.com>
Date: Thu, 9 Jun 2016 10:17:20 +0000 (+0900)
Subject: Remove capability and Modify daemon service for restart
X-Git-Tag: submit/tizen/20160609.105401^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7eb78d2b9e97135979c13b05355c5f770538355;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git

Remove capability and Modify daemon service for restart

Change-Id: I506ff23f87420787c53420fd65f63ac5ddb232f2
Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>
---

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 69f083e..787e599 100755
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -1,6 +1,6 @@
 Name:		net-config
 Summary:	TIZEN Network Configuration service
-Version:	1.1.70
+Version:	1.1.71
 Release:	2
 Group:		System/Network
 License:	Apache-2.0
diff --git a/resources/usr/lib/systemd/system/net-config.service b/resources/usr/lib/systemd/system/net-config.service
index e148d9e..000ca9a 100755
--- a/resources/usr/lib/systemd/system/net-config.service
+++ b/resources/usr/lib/systemd/system/net-config.service
@@ -4,11 +4,12 @@ Requires=dbus.socket
 After=dbus.socket
 
 [Service]
-Type=dbus
-BusName=net.netconfig
-RemainAfterExit=yes
+Type=forking
 ExecStartPre=-/usr/sbin/net-config.service
 ExecStart=/usr/sbin/net-config
+Restart=always
+CapabilityBoundingSet=~CAP_MAC_ADMIN
+CapabilityBoundingSet=~CAP_MAC_OVERRIDE
 
 [Install]
 WantedBy=multi-user.target
diff --git a/resources/usr/lib/systemd/system/net-config_tv.service b/resources/usr/lib/systemd/system/net-config_tv.service
index c8dec5b..7b3a1be 100755
--- a/resources/usr/lib/systemd/system/net-config_tv.service
+++ b/resources/usr/lib/systemd/system/net-config_tv.service
@@ -7,6 +7,8 @@ BusName=net.netconfig
 RemainAfterExit=yes
 ExecStartPre=-/usr/sbin/net-config.service
 ExecStart=/usr/sbin/net-config
+CapabilityBoundingSet=~CAP_MAC_ADMIN
+CapabilityBoundingSet=~CAP_MAC_OVERRIDE
 
 [Install]
 WantedBy=multi-user.target
diff --git a/resources/usr/sbin/net-config.service b/resources/usr/sbin/net-config.service
index a431731..8bfa94d 100755
--- a/resources/usr/sbin/net-config.service
+++ b/resources/usr/sbin/net-config.service
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-if [ -f ${TZ_SYS_ETC}/.mac.info ]; then
+if [ -f /opt/etc/.mac.info ]; then
 	bssid="$(/usr/bin/vconftool get -t string db/wifi/bssid_address | /bin/sed -n "/\([0-9A-F][0-9A-F]:\)\{5\}[0-9A-F][0-9A-F]/p")"
-	fbssid="$(/bin/cat ${TZ_SYS_ETC}/.mac.info | /bin/sed -n "/\([0-9A-F][0-9A-F]:\)\{5\}[0-9A-F][0-9A-F]/p")"
+	fbssid="$(/bin/cat /opt/etc/.mac.info | /bin/sed -n "/\([0-9A-F][0-9A-F]:\)\{5\}[0-9A-F][0-9A-F]/p")"
 
 	if [ "$bssid" != "$fbssid" ]; then
-		/bin/cat ${TZ_SYS_ETC}/.mac.info | /bin/sed -n "/^\([0-9A-F][0-9A-F]:\)\{5\}[0-9A-F][0-9A-F]$/p" | /usr/bin/xargs /usr/bin/vconftool set -t string db/wifi/bssid_address -f
+		/bin/cat /opt/etc/.mac.info | /bin/sed -n "/^\([0-9A-F][0-9A-F]:\)\{5\}[0-9A-F][0-9A-F]$/p" | /usr/bin/xargs /usr/bin/vconftool set -t string db/wifi/bssid_address -f
 	fi
 fi
 
@@ -20,3 +20,5 @@ fi
 
 [ -e /var/lib/wifi/.pseudonym.info ] && /bin/rm /var/lib/wifi/.pseudonym.info
 [ -e /var/lib/wifi/.pseudonym_sim.info ] && /bin/rm /var/lib/wifi/.pseudonym_sim.info
+
+exit 0