From: lace <>
Date: Mon, 26 Dec 2005 08:36:49 +0000 (+0000)
Subject: Fixed/protected package upgrades and inappropriate scripts execution.
X-Git-Tag: captive-1_1_6~31
X-Git-Url: http://git.jankratochvil.net/?p=captive.git;a=commitdiff_plain;h=04ce4dc0ef16efb6c5804f079ae56cc9dd3b92eb

Fixed/protected package upgrades and inappropriate scripts execution.
---

diff --git a/captive.spec.in b/captive.spec.in
index 6b53248..5398db1 100644
--- a/captive.spec.in
+++ b/captive.spec.in
@@ -238,21 +238,30 @@ touch %{_var}/lock/subsys/@PACKAGE@
 %if ! %{static}
 %preun fuse
 %endif
-/usr/lib/lsb/remove_initd @PACKAGE@ 2>/dev/null || \
-		/sbin/chkconfig --del @PACKAGE@
-%{_initrddir}/@PACKAGE@ stop
-rm -f %{_var}/lock/subsys/@PACKAGE@
+# Only on real erase, not on upgrade:
+if [ $1 = 0 ];then
+	/usr/lib/lsb/remove_initd @PACKAGE@ 2>/dev/null || \
+			/sbin/chkconfig --del @PACKAGE@
+	%{_initrddir}/@PACKAGE@ stop
+	rm -f %{_var}/lock/subsys/@PACKAGE@
+fi
 
 %if ! %{static}
 %preun install
 %endif
-%{_sbindir}/captive-install-fstab --remove
+# Only on real erase, not on upgrade:
+if [ $1 = 0 ];then
+	%{_sbindir}/captive-install-fstab --remove
+fi
 
 %postun
 /sbin/ldconfig
-# Remove stale sandbox chroot directories owned by 'captive.captive':
-rm -rf %{_var}/lib/@PACKAGE@/s-*
-rm -rf %{_var}/lib/@PACKAGE@/tmp/*
+# Only on real erase, not on upgrade:
+if [ $1 = 0 ];then
+	# Remove stale sandbox chroot directories owned by 'captive.captive':
+	rm -rf %{_var}/lib/@PACKAGE@/s-*
+	rm -rf %{_var}/lib/@PACKAGE@/tmp/*
+fi
 
 %files
 %defattr(-,root,root)