Changeset 2089 for trunk/server

Timestamp:

Dec 11, 2011, 4:33:10 AM (13 years ago)

Author:

geofft

Message:

openafs.spec: Don't attempt to restart OpenAFS on upgrade (Trac: #274)

systemd is actually rather capable of leaving the OpenAFS client in an
incredibly broken state, thanks to its willingness to track services and
kill their processes.  We should not attempt to restart it on upgrade,
whether a normal upgrade or a migration from SysV initscripts. In the
former case, it's fine (and correct) for the old AFS to keep running; in
the latter case, the unit file is capable of correctly shutting down an
initscript-launched client. The same is true for the OpenAFS server.

This brings the packaging in line with the SysV-style initscript code in
the specfile, which does not attempt to restart the service, as well as
with e.g. Debian's packaging, which uses --no-restart-on-upgrade.

File:

• trunk/server/fedora/specs/openafs-systemd.spec.patch (modified) (12 diffs)

trunk/server/fedora/specs/openafs-systemd.spec.patch

@@ -1 @@
---- rpmbuild/SPECS/openafs.spec.orig    2011-10-17 23:46:35.000000000 -0400
-+++ rpmbuild/SPECS/openafs.spec 2011-10-17 23:48:41.000000000 -0400
+--- openafs.spec.orig   2011-12-11 03:16:10.725175932 -0500
++++ openafs.spec        2011-12-11 04:22:10.313676135 -0500
 @@ -224,7 +224,7 @@
  BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -10 +10 @@
  BuildRequires: perl-devel perl-ExtUtils-Embed
  %endif
-@@ -323,6 +323,12 @@
+@@ -326,6 +326,12 @@
  %package client
  Provides: scripts-openafs-client
@@ -23 +23 @@
  %if %{fedorakmod}
  Requires: %{name}-kmod >= %{version}
-@@ -347,6 +353,12 @@
+@@ -350,6 +356,12 @@
  Requires: openafs = %{version}
  Summary: OpenAFS Filesystem Server
@@ -36 +36 @@
  %description server
  The AFS distributed filesystem.  AFS is a distributed filesystem
-@@ -999,7 +1011,12 @@
+@@ -1005,7 +1017,12 @@
  mkdir -p $RPM_BUILD_ROOT%{_sbindir}
  mkdir -p $RPM_BUILD_ROOT%{_libdir}
@@ -49 +49 @@
  mkdir -p $RPM_BUILD_ROOT%{pamdir}
  mkdir -p $RPM_BUILD_ROOT%{_prefix}/afs/etc
-@@ -1029,8 +1046,14 @@
+@@ -1035,8 +1052,14 @@
  
  # Copy root.client config files
@@ -64 +64 @@
  # Copy PAM modules
  install -m 755 ${sysname}/dest/lib/pam* $RPM_BUILD_ROOT%{pamdir}
-@@ -1310,7 +1333,14 @@
+@@ -1318,7 +1341,14 @@
  fi
  
@@ -79 +79 @@
         mkdir /afs
         chown root.root /afs
-@@ -1327,10 +1357,17 @@
+@@ -1335,10 +1365,17 @@
  
  %post server
@@ -97 +97 @@
  %if %{build_authlibs}
  %post authlibs
-@@ -1346,16 +1383,45 @@
+@@ -1354,16 +1391,37 @@
  fi
  
@@ -129 +129 @@
 +%postun client
 +/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-+if [ $1 -ge 1 ] ; then
-+    # Package upgrade, not uninstall
-+    /bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || :
-+fi
 +
 +%postun server
 +/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-+if [ $1 -ge 1 ] ; then
-+    # Package upgrade, not uninstall
-+    /bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || :
-+fi
  
  %if %{build_dkmspkg}
  %post -n dkms-%{name}
-@@ -1413,6 +1479,32 @@
+@@ -1421,6 +1479,24 @@
  %endif
  %endif
@@ -153 +145 @@
 +/usr/bin/systemd-sysv-convert --save openafs-client >/dev/null 2>&1 ||:
 +
-+# If the package is allowed to autostart:
-+/bin/systemctl --no-reload enable openafs-client.service >/dev/null 2>&1 ||:
-+
-+# Run these because the SysV package being removed won't do them
++# Run this because the SysV package being removed won't do it
 +/sbin/chkconfig --del openafs-client >/dev/null 2>&1 || :
-+/bin/systemctl try-restart openafs-client.service >/dev/null 2>&1 || : 
 +
 +%triggerun -- openafs-server < 1.6.0-1
@@ -166 +154 @@
 +/usr/bin/systemd-sysv-convert --save openafs-server >/dev/null 2>&1 ||:
 +
-+# If the package is allowed to autostart:
-+/bin/systemctl --no-reload enable openafs-server.service >/dev/null 2>&1 ||:
-+
-+# Run these because the SysV package being removed won't do them
++# Run this because the SysV package being removed won't do it
 +/sbin/chkconfig --del openafs-server >/dev/null 2>&1 || :
-+/bin/systemctl try-restart openafs-server.service >/dev/null 2>&1 || : 
 +
  ##############################################################################
  ###
  ### file lists
-@@ -1450,7 +1542,12 @@
+@@ -1458,7 +1534,12 @@
  %{pamdir}/pam_afs.krb.so
  %{pamdir}/pam_afs.so.1
@@ -189 +173 @@
  %{_mandir}/man1/copyauth.*
  %{_mandir}/man1/up.*
-@@ -1498,7 +1595,11 @@
+@@ -1506,7 +1587,11 @@
  %{_sbindir}/vldb_check
  %{_sbindir}/vldb_convert