From 661a80fa36fb903c87e45aa0dc0fb67027a4c027 Mon Sep 17 00:00:00 2001 From: "chleun.moon" Date: Wed, 14 Jun 2017 13:17:52 +0900 Subject: [PATCH] Apply chsmack for /opt/etc/resolv.conf in upgrade script Change-Id: Idcc2cda1089ea52b4fe6815d0a456df551d55313 Signed-off-by: cheoleun --- packaging/net-config.spec | 3 +++ scripts/500.netconfig_upgrade.sh | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/packaging/net-config.spec b/packaging/net-config.spec index 7843d3a..2fda630 100755 --- a/packaging/net-config.spec +++ b/packaging/net-config.spec @@ -104,6 +104,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 @@ -153,6 +155,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 -- 2.7.4