From f286ffa4be1e1146d83d41bc2b30742d1be8cec8 Mon Sep 17 00:00:00 2001 From: hyunuktak Date: Fri, 9 Dec 2016 10:20:27 +0900 Subject: Renamed upgrade script file name Change-Id: Id143c354d3ca8240da608aae2bcb07957b856dde Signed-off-by: hyunuktak --- packaging/connman.spec | 5 +++-- scripts/500.connman_upgrade.sh | 12 ++++++++++++ scripts/connman_upgrade.sh | 12 ------------ 3 files changed, 15 insertions(+), 14 deletions(-) create mode 100755 scripts/500.connman_upgrade.sh delete mode 100755 scripts/connman_upgrade.sh diff --git a/packaging/connman.spec b/packaging/connman.spec index 6a24f318..1df7d8f1 100755 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -34,6 +34,7 @@ Requires(preun): systemd Requires(postun): systemd Requires: net-config +%define upgrade_script_filename 500.connman_upgrade.sh %define upgrade_script_path /usr/share/upgrade/scripts %description @@ -197,7 +198,7 @@ cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus #OS Upgrade mkdir -p %{buildroot}%{upgrade_script_path} -cp -f scripts/connman_upgrade.sh %{buildroot}%{upgrade_script_path} +cp -f scripts/%{upgrade_script_filename} %{buildroot}%{upgrade_script_path} %post chsmack -a 'System' /%{_localstatedir}/lib/connman @@ -235,7 +236,7 @@ systemctl daemon-reload %attr(644,root,root) %{_libdir}/systemd/system/sockets.target.wants/connman.socket %endif %{_datadir}/license/connman -%{upgrade_script_path}/connman_upgrade.sh +%{upgrade_script_path}/%{upgrade_script_filename} %files test %manifest connman.manifest diff --git a/scripts/500.connman_upgrade.sh b/scripts/500.connman_upgrade.sh new file mode 100755 index 00000000..83f222b0 --- /dev/null +++ b/scripts/500.connman_upgrade.sh @@ -0,0 +1,12 @@ +#!/bin/sh +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +#-----------------------------------------------# +# connman patch script for upgrade (2.4 -> 3.0) # +#-----------------------------------------------# + +#/%{_localstatedir} = /opt/var + +chsmack -a 'System' /opt/var/lib/connman +chsmack -a 'System' /opt/var/lib/connman/settings + diff --git a/scripts/connman_upgrade.sh b/scripts/connman_upgrade.sh deleted file mode 100755 index 83f222b0..00000000 --- a/scripts/connman_upgrade.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -#-----------------------------------------------# -# connman patch script for upgrade (2.4 -> 3.0) # -#-----------------------------------------------# - -#/%{_localstatedir} = /opt/var - -chsmack -a 'System' /opt/var/lib/connman -chsmack -a 'System' /opt/var/lib/connman/settings - -- cgit v1.2.3