Change path of resolv.conf from /etc to /opt/etc and make symbolic link between them 90/110190/1 accepted/tizen/common/20170203.161805 accepted/tizen/ivi/20170203.090831 accepted/tizen/mobile/20170203.090748 accepted/tizen/tv/20170203.090802 accepted/tizen/wearable/20170203.090825 submit/tizen/20170203.072433
authorchleun.moon <chleun.moon@samsung.com>
Thu, 29 Dec 2016 09:02:16 +0000 (18:02 +0900)
committerchleun.moon <chleun.moon@samsung.com>
Fri, 13 Jan 2017 07:26:39 +0000 (16:26 +0900)
Change-Id: I66027a3c57cafb1aa9e114be6070d4465afcb8e9
Signed-off-by: cheoleun <chleun.moon@samsung.com>
packaging/net-config.spec

index 757375e..f9dea18 100755 (executable)
@@ -1,6 +1,6 @@
 Name:          net-config
 Summary:       TIZEN Network Configuration service
-Version:       1.1.97
+Version:       1.1.98
 Release:       2
 Group:         System/Network
 License:       Apache-2.0
@@ -102,8 +102,11 @@ ln -s ../net-config.service %{buildroot}%{_unitdir}/multi-user.target.wants/net-
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/
 cp resources/usr/share/dbus-1/system-services/net.netconfig.service %{buildroot}%{_datadir}/dbus-1/system-services/net.netconfig.service
 
-mkdir -p %{buildroot}%{_sysconfdir}/
-cp resources/etc/resolv.conf %{buildroot}%{_sysconfdir}/resolv.conf
+mkdir -p %{buildroot}%{TZ_SYS_ETC}
+cp resources/etc/resolv.conf %{buildroot}%{TZ_SYS_ETC}/resolv.conf
+
+mkdir -p %{buildroot}%{_sysconfdir}
+ln -s %{TZ_SYS_ETC}/resolv.conf %{buildroot}%{_sysconfdir}/resolv.conf
 
 #DBus DAC (net-config.manifest enables DBus SMACK)
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
@@ -125,6 +128,7 @@ cp -f scripts/500.netconfig_upgrade.sh %{buildroot}%{upgrade_script_path}
 
 %post
 chsmack -a 'System::Shared' %{_sysconfdir}/resolv.conf
+chsmack -a 'System::Shared' %{TZ_SYS_ETC}/resolv.conf
 
 #Network logs
 #mkdir -p /opt/usr/data/network
@@ -152,6 +156,7 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 %manifest net-config.manifest
 %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) %{_datadir}/dbus-1/system-services/*
 #DBus DAC
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*