diff options
| author | Michael Laß | 2022-07-21 23:10:50 +0200 |
|---|---|---|
| committer | Michael Laß | 2022-07-26 07:12:56 +0200 |
| commit | 89c78fad2ae582ee45af496094744892734bac4f (patch) | |
| tree | 49ea34e1f7be1716c970a44184449019af9f2a24 /0001-Adjust-RedHat-config-and-service-files.patch | |
| parent | 7e729c48fb070c2430e27c2b2e22506a9ec0044e (diff) | |
| download | aur-89c78fad2ae582ee45af496094744892734bac4f.tar.gz | |
Use patches likely to end up in next release
Instead of rolling our own set of patches for supporting newer kernels,
apply all changes that are accepted or likely to be accepted for the
next OpenAFS stable release. On top of that, backport patches for Linux
5.19.
Diffstat (limited to '0001-Adjust-RedHat-config-and-service-files.patch')
| -rw-r--r-- | 0001-Adjust-RedHat-config-and-service-files.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/0001-Adjust-RedHat-config-and-service-files.patch b/0001-Adjust-RedHat-config-and-service-files.patch deleted file mode 100644 index ded752e10eec..000000000000 --- a/0001-Adjust-RedHat-config-and-service-files.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 8750603a23dc71bd3d9c65eee792f81e0293bd80 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20La=C3=9F?= <lass@mail.uni-paderborn.de> -Date: Thu, 19 Feb 2015 19:34:00 +0100 -Subject: [PATCH] Adjust RedHat config and service files - -Basically we reuse upstream's config for RedHat but we change a few things: - - * adjust paths to match ArchLinux packaging - * remove the dynamic creation of CellServDB - * enable network traffic encryption by default - -Change-Id: I58edd1c30b0915624a386bbae96879345d7e8b4b ---- - src/packaging/RedHat/openafs-cacheinfo | 2 +- - src/packaging/RedHat/openafs-client.service | 15 +++++++-------- - src/packaging/RedHat/openafs-server.service | 4 ++-- - 3 files changed, 10 insertions(+), 11 deletions(-) - -diff --git a/src/packaging/RedHat/openafs-cacheinfo b/src/packaging/RedHat/openafs-cacheinfo -index dd0fd05cb..1663c79b5 100755 ---- a/src/packaging/RedHat/openafs-cacheinfo -+++ b/src/packaging/RedHat/openafs-cacheinfo -@@ -1 +1 @@ --/afs:/usr/vice/cache:100000 -+/afs:/var/cache/openafs:100000 -diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service -index f79240c7f..a63fce486 100644 ---- a/src/packaging/RedHat/openafs-client.service -+++ b/src/packaging/RedHat/openafs-client.service -@@ -7,15 +7,14 @@ Before=remote-fs.target - [Service] - Type=forking - RemainAfterExit=true --EnvironmentFile=/etc/sysconfig/openafs -+EnvironmentFile=/etc/conf.d/openafs - ExecStartPre=/bin/bash -c "fs sysname > /dev/null 2>/dev/null; test $? -ne 0 || (echo AFS client appears to be running -- not starting && exit 1)" --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 --ExecStop=/usr/vice/etc/afsd -shutdown --ExecStop=/sbin/rmmod openafs -+ExecStartPre=/usr/bin/modprobe openafs -+ExecStart=/usr/bin/afsd $AFSD_ARGS -+ExecStartPost=/usr/bin/fs setcrypt on -+ExecStop=/usr/bin/umount /afs -+ExecStop=/usr/bin/afsd -shutdown -+ExecStop=/usr/bin/rmmod openafs - KillMode=none - - [Install] -diff --git a/src/packaging/RedHat/openafs-server.service b/src/packaging/RedHat/openafs-server.service -index ac9d3c411..0a4b3bfea 100644 ---- a/src/packaging/RedHat/openafs-server.service -+++ b/src/packaging/RedHat/openafs-server.service -@@ -3,8 +3,8 @@ Description=OpenAFS Server Service - After=syslog.target network.target - - [Service] --EnvironmentFile=-/etc/sysconfig/openafs --ExecStart=/usr/afs/bin/bosserver -nofork $BOSSERVER_ARGS -+EnvironmentFile=-/etc/conf.d/openafs -+ExecStart=/usr/bin/bosserver -nofork $BOSSERVER_ARGS - ExecStop=/usr/bin/bos shutdown localhost -wait -localauth - - [Install] --- -2.32.0 - |