From: chleun.moon <chleun.moon@samsung.com>
Date: Wed, 14 Jun 2017 04:17:52 +0000 (+0900)
Subject: Apply chsmack for /opt/etc/resolv.conf in upgrade script
X-Git-Tag: accepted/tizen/unified/20170630.083007^0
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fconnectivity%2Fnet-config.git;a=commitdiff_plain;h=a6ef2df18babb0c04246189ae0a8fc6dcff1faa1

Apply chsmack for /opt/etc/resolv.conf in upgrade script

Change-Id: Idcc2cda1089ea52b4fe6815d0a456df551d55313
Signed-off-by: cheoleun <chleun.moon@samsung.com>
---

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index d473173..c55af45 100755
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -119,6 +119,8 @@ cp resources/usr/share/dbus-1/system-services/net.netconfig.service %{buildroot}
 
 mkdir -p %{buildroot}%{TZ_SYS_ETC}
 cp resources/etc/resolv.conf %{buildroot}%{TZ_SYS_ETC}/resolv.conf
+mkdir -p %{buildroot}/usr/share/upgrade/data/
+cp resources/etc/resolv.conf %{buildroot}/usr/share/upgrade/data/resolv.conf
 
 mkdir -p %{buildroot}%{_sysconfdir}
 ln -s %{TZ_SYS_ETC}/resolv.conf %{buildroot}%{_sysconfdir}/resolv.conf
@@ -168,6 +170,7 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 %attr(500,root,root) %{_sbindir}/*
 %attr(644,root,root) %{_sysconfdir}/resolv.conf
 %attr(644,root,root) %{TZ_SYS_ETC}/resolv.conf
+%attr(644,root,root) /usr/share/upgrade/data/resolv.conf
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/*
 #DBus DAC
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*
diff --git a/scripts/500.netconfig_upgrade.sh b/scripts/500.netconfig_upgrade.sh
index 4be10bf..b7f7ef5 100755
--- a/scripts/500.netconfig_upgrade.sh
+++ b/scripts/500.netconfig_upgrade.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
+source /etc/tizen-platform.conf
 
 #-----------------------------------------------#
 # netconfig patch for upgrade (2.4 -> 3.0)      #
@@ -11,3 +12,6 @@ rm -f /opt/etc/dump.d/module.d/network_log_dump.sh
 rm -f /opt/var/lib/net-config/network_dump.sh
 rm -f /opt/var/lib/net-config/network_log_dump.sh
 rm -rf /opt/usr/data/network
+
+cp /usr/share/upgrade/data/resolv.conf %{TZ_SYS_ETC}/resolv.conf
+chsmack -a 'System::Shared' %{TZ_SYS_ETC}/resolv.conf