diff options
| author | Michael Lass | 2020-05-19 15:28:35 +0200 |
|---|---|---|
| committer | Michael Lass | 2020-05-19 16:28:18 +0200 |
| commit | 6ffc7d6ad766197be8c759c412932a99f2182fbc (patch) | |
| tree | a8b389c564900ac6eb9b44df8bf01775ea404478 /0002-Adjust-RedHat-config-and-service-files.patch | |
| parent | 89b882d7b528a066b35924a902466d7cd63a7bcb (diff) | |
| download | aur-6ffc7d6ad766197be8c759c412932a99f2182fbc.tar.gz | |
Update to actual 1.8.6pre2 and fix build with GCC 10
Diffstat (limited to '0002-Adjust-RedHat-config-and-service-files.patch')
| -rw-r--r-- | 0002-Adjust-RedHat-config-and-service-files.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/0002-Adjust-RedHat-config-and-service-files.patch b/0002-Adjust-RedHat-config-and-service-files.patch new file mode 100644 index 000000000000..6e16f8de5dbd --- /dev/null +++ b/0002-Adjust-RedHat-config-and-service-files.patch @@ -0,0 +1,70 @@ +From 4d84dcc621373c7a146cf3e97dbaf600bb0dd219 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 2/2] 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.26.2 + |