diff --git a/openafs-fuse-client.service b/openafs-fuse-client.service index 0d88b4d..458e3b0 100644 --- a/openafs-fuse-client.service +++ b/openafs-fuse-client.service @@ -7,13 +7,11 @@ Before=remote-fs.target [Service] Type=forking RemainAfterExit=true -EnvironmentFile=/etc/sysconfig/openafs-client +EnvironmentFile=/etc/sysconfig/openafs-fuse-client ExecStartPre=/bin/chmod 0644 /etc/openafs/CellServDB -ExecStartPre=/sbin/modprobe libafs -ExecStart=/usr/sbin/afsd $AFSD_ARGS +ExecStart=/usr/sbin/afsd.fuse $AFSD_ARGS ExecStop=/bin/umount /afs -ExecStop=/etc/openafs/afsd -shutdown -ExecStop=/sbin/rmmod libafs +ExecStop=/etc/openafs/afsd.fuse -shutdown KillMode=none [Install] diff --git a/openafs.changes b/openafs.changes index 4f1380b..4c33d57 100644 --- a/openafs.changes +++ b/openafs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Apr 6 10:53:13 UTC 2018 - christof.hanke@mpcdf.mpg.de + +- fix dependencies between packages, so that fuse-client + can be installed. +- cleanup old sys-v sysconfig files and other minor fixes +- fix unit file for fuse-client + ------------------------------------------------------------------- Mon Apr 2 20:59:53 UTC 2018 - christof.hanke@mpcdf.mpg.de diff --git a/openafs.spec b/openafs.spec index f0612ce..7bd4320 100644 --- a/openafs.spec +++ b/openafs.spec @@ -78,8 +78,6 @@ Source3: openafs-%{version}-doc.tar.bz2.md5 Source4: openafs-%{version}-src.tar.bz2.sha256 Source5: openafs-%{version}-doc.tar.bz2.sha256 Source10: README.SUSE.openafs -Source13: sysconfig.openafs-client -Source14: sysconfig.openafs-server Source15: logrotate.openafs-server Source16: ld.conf.openafs Source18: RELNOTES-%{version} @@ -261,7 +259,7 @@ Requires: heimdal-tools %package krb5-mit Summary: OpenAFS programs to use with krb5 Group: System/Filesystems -Requires: %{name}-client = %{version} +Requires: %{name}-client Requires: krb5-client %description krb5-mit @@ -293,14 +291,8 @@ the openafs package. %package fuse_client Summary: OpenAFS FUSE File System Client Group: System/Filesystems -Requires: %{name} = %{version} -Requires: %{name}-krb5-mit = %{version} Conflicts: %{name}-client -Requires: coreutils -Requires: diffutils -Requires: fillup -Requires: grep -Requires: sed +Requires: %{name} = %{version} %description fuse_client AFS is a cross-platform distributed file system product pioneered at @@ -319,11 +311,6 @@ Group: System/Filesystems Requires: %{name} = %{version} Requires: %{name}-kmp Requires: %{name}-krb5-mit = %{version} -Requires: coreutils -Requires: diffutils -Requires: fillup -Requires: grep -Requires: sed %description client AFS is a cross-platform distributed file system product pioneered at @@ -549,6 +536,10 @@ for f in $(ls backup*); do done cd $OLD_PWD +# create manpage for afsd.fuse as a real file +rm %{buildroot}/%{_mandir}/man8/afsd.fuse.8 +cp -p %{buildroot}/%{_mandir}/man8/afsd.8 %{buildroot}/%{_mandir}/man8/afsd.fuse.8 + # move %%{_libdir}/afs-stuff to %%{_libdir}/openafs mv %{buildroot}/%{_libdir}/afs/* %{buildroot}/%{_libdir}/openafs mv %{buildroot}/%{_libdir}/*.* %{buildroot}/%{_libdir}/openafs @@ -570,9 +561,6 @@ rm %{buildroot}/%{_libdir}/libafsrpc.so rm %{buildroot}/%{_libdir}/libkopenafs.so %endif -# check for duplicates, remove them and link them -%fdupes %{buildroot} - # remove all static libraries find %{buildroot} -type f -name "*.a" -delete @@ -600,6 +588,9 @@ for d in %{buildroot}%{_mandir}/man*; do done cd $OLD_PWD +# check for duplicates, remove them and link them +%fdupes %{buildroot} + # # main @@ -607,9 +598,6 @@ cd $OLD_PWD %postun -p /sbin/ldconfig -# -# kernel-source - %post kernel-source echo To install the kernel-module, do: echo cd /usr/src/kernel-modules/openafs @@ -627,6 +615,9 @@ echo sh ./build-modules.sh install %{stop_on_removal} %post fuse_client +if [ ! -d /afs ]; then + mkdir /afs +fi %{fillup_only -n openafs-fuse-client} %service_add_post openafs-fuse-client.service /sbin/ldconfig @@ -648,6 +639,9 @@ fi %postun fuse_client %service_del_postun openafs-fuse-client.service +if [ -d /afs ]; then + echo make sure to remove directory /afs if unwanted. +fi /sbin/ldconfig # diff --git a/sysconfig.openafs-client b/sysconfig.openafs-client deleted file mode 100644 index 58f4576..0000000 --- a/sysconfig.openafs-client +++ /dev/null @@ -1,144 +0,0 @@ -## Path: Network/File systems/AFS client -## Description: AFS client configuration, default mode -## Type: yesno -## Default: no -# -# Set to "yes" if you want to generate CellServDB and ThisCell files -# from THIS_CELL and THIS_CELL_SERVER variables. -# If you want more complicated setting, set REGENERATE_CELL_INFO to "no" -# and edit the files manually. -# -REGENERATE_CELL_INFO="no" - -## Type: string -## Default: "" -# -# This cell name -# -THIS_CELL="" - -## Type: string -## Default: "" -# -# IP address of afs server for this cell -# -THIS_CELL_SERVER="" - -## Type: string -## Default: "" -# -# DNS name of afs server for this cell -# -THIS_CELL_SERVER_NAME="" - -## Type: yesno -## Default: yes -# -# Set to "yes" if you want to use data encription (secure, slower) -# -DATA_ENCRYPTION="yes" - -## Type: yesno -## Default: yes -# -# Set to "yes" if you want to generate cacheinfo file -# -REGENERATE_CACHE_INFO="yes" - -## Type: string -## Default: "" -# -# AFS client configuration options -# -XXLARGE="-stat 8000 -daemons 6 -volumes 256 -files 50000" -XLARGE="-stat 3600 -daemons 5 -volumes 196 -files 50000" -LARGE="-stat 2800 -daemons 5 -volumes 128" -MEDIUM="-stat 2000 -daemons 3 -volumes 70" -SMALL="-stat 300 -daemons 2 -volumes 50" - -## Type: yesno -## Default: yes -# -# Instead of mounting the home cell's root.afs volume at the AFS mount -# point (typically /afs) a fake root is constructed from information -# available in the client's CellServDB. -# With this option enabled openafs can start up even on network outage. -# -DYNROOT="yes" - -## Type: yesno -## Default: yes -# -# Instead of calling a stat on a mountpoint to a foreign cell, -# return a faked status to the application. -# "ls -l /afs" is the most prominent example for its usefulness. -# -FAKESTAT="yes" - - -## Type: yesno -## Default: yes -# -# Instead of looking up database server in CellServDB try DNS first. -# With this option enabled openafs can access cells which are not in the packaged CellServDB-file, but -# which do provide the required DNS-information. -# -AFSDB="yes" - -## Type: yesno -## Default: yes -# -# use memory-only cache -# -MEMCACHE="yes" - -## Type: string(AUTOMATIC) -## Default: AUTOMATIC -# -# if you set CACHESIZE to "AUTOMATIC", it will automatically be chosen -# deduced by parition sizes (does not work if your cache is on / or -# /usr or /var) or by machine memory size for memory-only cache, -# otherwise the value in (1k-blocks) specified here will be used. -# -CACHESIZE="AUTOMATIC" - -## Type: string(AUTOMATIC,$XXLARGE,$XLARGE,$LARGE,$MEDIUM,$SMALL) -## Default: AUTOMATIC -# -# If you set OPTIONS to "AUTOMATIC", the init script will choose a set -# of options based on the cache size, otherwise the values specified here -# will be used. -# -OPTIONS="AUTOMATIC" - -## Type: string(/var/cache/openafs) -## Default: /var/cache/openafs -# -# Path to cache directory, it is recommended to use separate partition. -# It does not work on reiserfs. A valid directory must be specified -# even if memory only cache is used. -# Recommended cache directory is "/var/cache/openafs" -# -CACHEDIR="/var/cache/openafs" - -## Type: string(/afs) -## Default: /afs -# -# AFS directory. You should never need to change this -# -AFSDIR=/afs - -## Type: yesno -## Default: no -# -# Set to "yes" for a lot of debugging information from afsd. Only -# useful for debugging as it prints _a lot_ of information. -# -VERBOSE="no" - -## Type: string -## Default: "" -# -# SYSNAME of client. Used to expand the magic "@sys" in pathes within /afs. -# If left blank, the hardcoded sysname (e.g. amd64_linux26) will be used. -SYSNAME="" diff --git a/sysconfig.openafs-server b/sysconfig.openafs-server deleted file mode 100644 index b152f36..0000000 --- a/sysconfig.openafs-server +++ /dev/null @@ -1,79 +0,0 @@ -## Path: Network/File systems/AFS server -## Description: AFS server configuration, default mode -## Type: yesno -## Default: no -# -# Set to "yes" if you want to generate the BosConfig file -# from START_DB_SERVERS, START_FILESERVER and accompanying variables. -# If you want more complicated setting, set REGENERATE_BOS_CONFIG to "no" -# and edit the files manually. -# -REGENERATE_BOS_CONFIG="no" - -## Type: yesno -## Default: yes -# -# Set to "yes" if you require a NetInfo file before starting the service. -# useful for new installations, where you might forget this issue. -# -REQUIRE_NETINFO="yes" - -## Type: yesno -## Default: no -# -# Set to "yes" if want to start the database servers (vlserver,ptserver) on this host. -# Only useful if REGENERATE_BOS_CONFIG is set to 'yes' -# -START_DB_SERVERS="no" - -## Type: yesno -## Default: no -# -# Set to "yes" if want to start the fileserver on this host. -# Only useful if REGENERATE_BOS_CONFIG is set to 'yes' -# -START_FILESERVER="no" - -## Type: yesno -## Default: no -# -# Set to "yes" if want to start the bosserver in restricted mode on this host. -# Only useful if REGENERATE_BOS_CONFIG is set to 'yes' -# -BOSSERVER_RESTICTED="no" - -## Type: string -## Default: "" -# -# Set time to restart the AFS-servers at a given time in the week. -# Leave empty if you don't want to restart the servers at all -# Only useful if REGENERATE_BOS_CONFIG is set to 'yes' -# -BOSSERVER_RESTART_TIME="" - - -## Type: string -## Default: "" -# -# Set time to check for new server-binaries of the AFS-servers at a given time in the week. -# Leave empty if you don't want to do this automatic restart. -# When upgrading the openafs-servers rpm, running server processes are not restarted automatically. -# Use this to do so automatically. -# Only useful if REGENERATE_BOS_CONFIG is set to 'yes' -# -BOSSERVER_RESTART_FOR_NEWBINARIES_TIME="" - -## Type: string -## Default: "" -# -# AFS server configuration options -# command line options how to start the required servers. -# Only useful if REGENERATE_BOS_CONFIG is set to 'yes' -# - -BOSSERVER_OPTIONS="" -PTSERVER_OPTIONS="" -VLSERVER_OPTIONS="" -FSSERVER_OPTIONS="" -VOLSERVER_OPTIONS="" -SALVAGER_OPTIONS=""