Author: ktdreyer Update of /cvs/free/rpms/openafs/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27361 Modified Files: .cvsignore openafs.spec sources Added Files: openafs-1.6.6-systemd-env-vars.patch openafs-1.6.6-systemd-execpoststart.patch openafs-1.6.6-systemd-fhs.patch openafs-1.6.6-systemd-kmod-name.patch openafs-1.6.6-systemd-no-cellservdb.patch Removed Files: openafs-1.6.1-systemd-env-vars.patch openafs-1.6.1-systemd-execpoststart.patch openafs-1.6.1-systemd-fhs.patch openafs-1.6.1-systemd-kmod-name.patch openafs-1.6.1-systemd-no-cellservdb.patch Log Message: * Sat Nov 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 1.6.6-0.pre1 - Update to OpenAFS 1.6.6pre1 - Rebase systemd patches to 1.6.6 openafs-1.6.6-systemd-env-vars.patch: openafs-client.service | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE openafs-1.6.6-systemd-env-vars.patch --- From: Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; Date: Mon, 8 Oct 2012 20:59:43 -0600 Subject: [PATCH 4/5] systemd: add more environment variables to openafs-client.service At the risk of deviating too far from upstream, this permits a few more user-friendly environment variables in /etc/sysconfig/openafs. Change-Id: Ib0938b2865005fc1f1b1c49dfda0d4bf92957004 --- src/packaging/RedHat/openafs-client.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service index 89a344f..719aed77 100644 --- a/src/packaging/RedHat/openafs-client.service +++ b/src/packaging/RedHat/openafs-client.service @@ -6,7 +6,7 @@ After=syslog.target network.target Type=forking EnvironmentFile=/etc/sysconfig/openafs ExecStartPre=/sbin/modprobe openafs -ExecStart=/usr/sbin/afsd $AFSD_ARGS +ExecStart=/usr/sbin/afsd $AFSD_ARGS $CACHE $OPTIONS $CONFDIR ExecStop=/bin/umount /afs ExecStop=/usr/sbin/afsd -shutdown ExecStop=/sbin/rmmod libafs -- 1.8.3.1 openafs-1.6.6-systemd-execpoststart.patch: openafs-client.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE openafs-1.6.6-systemd-execpoststart.patch --- From: Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; Date: Mon, 8 Oct 2012 21:01:52 -0600 Subject: [PATCH 5/5] systemd: run "sysnames" script after starting afsd This helper script will set any custom sysnames on the client. Change-Id: Ibdb770fac20eb26b137bd02a71a52e0c801b039d --- src/packaging/RedHat/openafs-client.service | 1 + 1 file changed, 1 insertion(+) diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service index 719aed77..aac1ca7 100644 --- a/src/packaging/RedHat/openafs-client.service +++ b/src/packaging/RedHat/openafs-client.service @@ -7,6 +7,7 @@ Type=forking EnvironmentFile=/etc/sysconfig/openafs ExecStartPre=/sbin/modprobe openafs ExecStart=/usr/sbin/afsd $AFSD_ARGS $CACHE $OPTIONS $CONFDIR +ExecStartPost=/usr/libexec/openafs/sysnames ExecStop=/bin/umount /afs ExecStop=/usr/sbin/afsd -shutdown ExecStop=/sbin/rmmod libafs -- 1.8.3.1 openafs-1.6.6-systemd-fhs.patch: openafs-client.service | 4 ++-- openafs-server.service | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) --- NEW FILE openafs-1.6.6-systemd-fhs.patch --- From: Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; Date: Mon, 8 Oct 2012 20:58:13 -0600 Subject: [PATCH 3/5] systemd: use FHS-style paths The unit files from openafs.org still refer to the old transarc paths. Replace them with FHS-compliant paths. Change-Id: Iff326d082a00e3632ff7a8c9983fbf277ce6b4eb --- src/packaging/RedHat/openafs-client.service | 4 ++-- src/packaging/RedHat/openafs-server.service | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service index a5fb287..89a344f 100644 --- a/src/packaging/RedHat/openafs-client.service +++ b/src/packaging/RedHat/openafs-client.service @@ -6,9 +6,9 @@ After=syslog.target network.target Type=forking EnvironmentFile=/etc/sysconfig/openafs ExecStartPre=/sbin/modprobe openafs -ExecStart=/usr/vice/etc/afsd $AFSD_ARGS +ExecStart=/usr/sbin/afsd $AFSD_ARGS ExecStop=/bin/umount /afs -ExecStop=/usr/vice/etc/afsd -shutdown +ExecStop=/usr/sbin/afsd -shutdown ExecStop=/sbin/rmmod libafs KillMode=none diff --git a/src/packaging/RedHat/openafs-server.service b/src/packaging/RedHat/openafs-server.service index ac9d3c4..d8904bf 100644 --- a/src/packaging/RedHat/openafs-server.service +++ b/src/packaging/RedHat/openafs-server.service @@ -4,7 +4,7 @@ After=syslog.target network.target [Service] EnvironmentFile=-/etc/sysconfig/openafs -ExecStart=/usr/afs/bin/bosserver -nofork $BOSSERVER_ARGS +ExecStart=/usr/sbin/bosserver -nofork $BOSSERVER_ARGS ExecStop=/usr/bin/bos shutdown localhost -wait -localauth [Install] -- 1.8.3.1 openafs-1.6.6-systemd-kmod-name.patch: openafs-client.service | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE openafs-1.6.6-systemd-kmod-name.patch --- From: Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; Date: Mon, 8 Oct 2012 20:55:50 -0600 Subject: [PATCH 2/5] systemd: unload module "libafs" Load the module as "openafs", but unload it using the name "libafs". Change-Id: Ib7d3d9b80ff58e9cded9a3171a5b003f1995a5b7 --- src/packaging/RedHat/openafs-client.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service index 2ee652a..a5fb287 100644 --- a/src/packaging/RedHat/openafs-client.service +++ b/src/packaging/RedHat/openafs-client.service @@ -9,7 +9,7 @@ ExecStartPre=/sbin/modprobe openafs ExecStart=/usr/vice/etc/afsd $AFSD_ARGS ExecStop=/bin/umount /afs ExecStop=/usr/vice/etc/afsd -shutdown -ExecStop=/sbin/rmmod openafs +ExecStop=/sbin/rmmod libafs KillMode=none [Install] -- 1.8.3.1 openafs-1.6.6-systemd-no-cellservdb.patch: openafs-client.service | 3 --- 1 file changed, 3 deletions(-) --- NEW FILE openafs-1.6.6-systemd-no-cellservdb.patch --- From: Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; Date: Mon, 8 Oct 2012 20:55:12 -0600 Subject: [PATCH 1/5] systemd: skip CellServDB manipulation Change-Id: I23544f183c0423b208b6465c8d7184d64b6b4a15 --- src/packaging/RedHat/openafs-client.service | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service index 936762e..2ee652a 100644 --- a/src/packaging/RedHat/openafs-client.service +++ b/src/packaging/RedHat/openafs-client.service @@ -5,8 +5,6 @@ After=syslog.target network.target [Service] Type=forking EnvironmentFile=/etc/sysconfig/openafs -ExecStartPre=/bin/sed -n 'w/usr/vice/etc/CellServDB' /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.dist -ExecStartPre=/bin/chmod 0644 /usr/vice/etc/CellServDB ExecStartPre=/sbin/modprobe openafs ExecStart=/usr/vice/etc/afsd $AFSD_ARGS ExecStop=/bin/umount /afs -- 1.8.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/openafs/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 11 Oct 2013 20:46:01 -0000 1.16 +++ .cvsignore 30 Nov 2013 02:26:26 -0000 1.17 @@ -1,2 +1,2 @@ -openafs-1.6.5.1-src.tar.bz2 -openafs-1.6.5.1-doc.tar.bz2 +openafs-1.6.6pre1-src.tar.bz2 +openafs-1.6.6pre1-doc.tar.bz2 Index: openafs.spec =================================================================== RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- openafs.spec 11 Oct 2013 20:46:02 -0000 1.43 +++ openafs.spec 30 Nov 2013 02:26:26 -0000 1.44 @@ -10,6 +10,8 @@ %define sysname amd64_linux26 %endif +%define pre pre1 + # Use systemd unit files on Fedora 18 and above. %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %global _with_systemd 1 @@ -18,13 +20,13 @@ Summary: Enterprise Network File System Name: openafs -Version: 1.6.5.1 -Release: 1%{?dist} +Version: 1.6.6 +Release: 0.%{pre}%{?dist} License: IBM Group: System Environment/Daemons URL: http://www.openafs.org -Source0: http://dl.openafs.org/dl/%{version}/%{name}-%{version}-src.tar.bz2 -Source1: http://dl.openafs.org/dl/%{version}/%{name}-%{version}-doc.tar.bz2 +Source0: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{name}-%{version}%{p... +Source1: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{name}-%{version}%{p... Source11: http://grand.central.org/dl/cellservdb/CellServDB Source12: cacheinfo Source13: openafs.init @@ -47,15 +49,15 @@ Patch0: openafs-1.6.0-fPIC.patch # systemd: Skip CellServDB manipulation -Patch1: openafs-1.6.1-systemd-no-cellservdb.patch +Patch1: openafs-1.6.6-systemd-no-cellservdb.patch # systemd: unload the proper kernel module -Patch2: openafs-1.6.1-systemd-kmod-name.patch +Patch2: openafs-1.6.6-systemd-kmod-name.patch # systemd: use FHS-style paths instead of transarc paths -Patch3: openafs-1.6.1-systemd-fhs.patch +Patch3: openafs-1.6.6-systemd-fhs.patch # systemd: add additional user-friendly environment vars -Patch4: openafs-1.6.1-systemd-env-vars.patch +Patch4: openafs-1.6.6-systemd-env-vars.patch # Add ExecPostStart "sysnames" helper script. -Patch5: openafs-1.6.1-systemd-execpoststart.patch +Patch5: openafs-1.6.6-systemd-execpoststart.patch %description @@ -131,7 +133,7 @@ Cell. %prep -%setup -q -b 1 -n openafs-%{version} +%setup -q -b 1 -n openafs-%{version}%{pre} # This changes osconf.m4 to build with -fPIC on i386 and x86_64 %patch0 @@ -457,6 +459,10 @@ %{_datadir}/openafs/C/afszcm.cat %changelog +* Sat Nov 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; - 1.6.6-0.pre1 +- Update to OpenAFS 1.6.6pre1 +- Rebase systemd patches to 1.6.6 + * Fri Oct 11 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com&gt; 0:1.6.5.1-1 - Update to OpenAFS 1.6.5.1 Index: sources =================================================================== RCS file: /cvs/free/rpms/openafs/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 11 Oct 2013 20:46:02 -0000 1.20 +++ sources 30 Nov 2013 02:26:26 -0000 1.21 @@ -1,2 +1,2 @@ -70576ac8bd7ae2f8a4d4095fd16a1679 openafs-1.6.5.1-src.tar.bz2 -858abcd44923075630836c0196a2c0bb openafs-1.6.5.1-doc.tar.bz2 +c771d56cfddf5fe5ac00e610c2b47613 openafs-1.6.6pre1-src.tar.bz2 +ad98010dfca94b4c72a77f4db2046f26 openafs-1.6.6pre1-doc.tar.bz2 --- openafs-1.6.1-systemd-env-vars.patch DELETED --- --- openafs-1.6.1-systemd-execpoststart.patch DELETED --- --- openafs-1.6.1-systemd-fhs.patch DELETED --- --- openafs-1.6.1-systemd-kmod-name.patch DELETED --- --- openafs-1.6.1-systemd-no-cellservdb.patch DELETED ---