From 460cb6a4aa317ed6af7c26abbf3b27656c4606d4 Mon Sep 17 00:00:00 2001
From: hyunuktak <hyunuk.tak@samsung.com>
Date: Wed, 5 Oct 2016 11:50:02 +0900
Subject: [PATCH] Remove useless pre-start net-config.service file

Change-Id: I94c1050191a0f7b5f8926e48268750a2528a83aa
Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>
---
 packaging/net-config.spec                          |  5 +---
 .../usr/lib/systemd/system/net-config.service      |  1 -
 resources/usr/sbin/net-config.service              | 27 ----------------------
 3 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100755 resources/usr/sbin/net-config.service

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 1de2c15..16ecae3 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.91
+Version:	1.1.92
 Release:	2
 Group:		System/Network
 License:	Apache-2.0
@@ -99,9 +99,6 @@ cp resources/usr/share/dbus-1/system-services/net.netconfig.service %{buildroot}
 mkdir -p %{buildroot}%{_sysconfdir}/
 cp resources/etc/resolv.conf %{buildroot}%{_sysconfdir}/resolv.conf
 
-mkdir -p %{buildroot}%{_sbindir}/
-cp resources/usr/sbin/net-config.service %{buildroot}%{_sbindir}/net-config.service
-
 #DBus DAC (net-config.manifest enables DBus SMACK)
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
 cp resources/etc/dbus-1/system.d/net-config.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/net-config.conf
diff --git a/resources/usr/lib/systemd/system/net-config.service b/resources/usr/lib/systemd/system/net-config.service
index b887746..26685b4 100755
--- a/resources/usr/lib/systemd/system/net-config.service
+++ b/resources/usr/lib/systemd/system/net-config.service
@@ -6,7 +6,6 @@ After=dbus.socket
 [Service]
 Type=forking
 SmackProcessLabel=System
-ExecStartPre=-/usr/sbin/net-config.service
 ExecStart=/usr/sbin/net-config
 Restart=always
 CapabilityBoundingSet=~CAP_MAC_ADMIN
diff --git a/resources/usr/sbin/net-config.service b/resources/usr/sbin/net-config.service
deleted file mode 100755
index 756782e..0000000
--- a/resources/usr/sbin/net-config.service
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-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 /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 /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
-
-if [ ! -d /var/lib/net-config ]; then
-	/bin/mkdir -p /var/lib/net-config
-fi
-
-if [ ! -f /var/lib/net-config/.provisioned ]; then
-	if [ -f /opt/system/csc-default/usr/wifi/preprofiles ]; then
-		/bin/cp -R /opt/system/csc-default/usr/wifi/preprofiles/* /var/lib/connman/
-	fi
-	/bin/touch /var/lib/net-config/.provisioned
-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
-- 
2.7.4