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 69f083e12b0f813011d6383d950e4610dc14babe..787e5996e770141662c44451a1b5cde8b3336781 100755 (executable)
--- 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 e148d9ef974170fed367dfcf4a5ecd966d50cac8..000ca9a34d417373a7b63a685b1aba29a63068eb 100755 (executable)
--- 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 c8dec5b4d423a51111c6c669447fe67dc54813b5..7b3a1be773d604d9e2421501ff73d2d2839aa686 100755 (executable)
--- 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 a4317319eb5dd828ee44c31f42ae98c7ffff1cef..8bfa94da034d2fc5ae034a917ea5ef4515793a84 100755 (executable)
--- 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