From b8180c9f6183d9812716c88b14c1c0a8fef5233d Mon Sep 17 00:00:00 2001 From: "chleun.moon" Date: Thu, 29 Dec 2016 18:02:16 +0900 Subject: [PATCH] Change path of resolv.conf from /etc to /opt/etc and make symbolic link between them Change-Id: I66027a3c57cafb1aa9e114be6070d4465afcb8e9 Signed-off-by: cheoleun --- packaging/net-config.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packaging/net-config.spec b/packaging/net-config.spec index 757375e..f9dea18 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.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/* -- 2.7.4