| Message ID | 20140220065530.7320.38662.stgit@notabene.brown (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/20/2014 01:55 AM, Neil Brown wrote: > This script provides the required translation for > sysconfig variables understood by init.d script on openSUSE. > > Signed-off-by: NeilBrown <neilb@suse.de> > --- > systemd/SUSE-nfs-utils_env.sh | 62 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 62 insertions(+) > create mode 100644 systemd/SUSE-nfs-utils_env.sh I was thinking about this one too... Yeah, I know.. I need life!! ;-) Do we really want distro specific files like this in the upstream repo? Its more of a maintenance thing than anything... If something distro specific changes, do we really need to send the change upstream and does upstream really care? steved. > > diff --git a/systemd/SUSE-nfs-utils_env.sh b/systemd/SUSE-nfs-utils_env.sh > new file mode 100644 > index 000000000000..8d6d94ed29e5 > --- /dev/null > +++ b/systemd/SUSE-nfs-utils_env.sh > @@ -0,0 +1,62 @@ > +#!/bin/sh > + > +# extract configuration from /etc/sysconfig/nfs-utils and write > +# environment to /run/sysconfig/nfs-utils to be used by systemd unit > +# files. > +# This script expect configuration as used by openSUSE-13.1 and later > +# > + > +nfs_config=/etc/sysconfig/nfs > +if test -r $nfs_config; then > + . $nfs_config > +fi > + > +pipefs= > +if [ -n "$RPC_PIPEFS_DIR" -a "$RPC_PIPEFS_DIR" != "/var/lib/nfs/rpc_pipefs" ]; then > + pipefs="-p /var/lib/nfs/rpc_pipefs" > +fi > + > +mountdport= > +if [ -n "$MOUNTD_PORT" ]; then > + mountdport="-p $MOUNTD_PORT" > +fi > + > +case $NFS_GSSD_AVOID_DNS in > + [Nn]*) ignore_dns=-D ;; > + [Yy]*) ignore_dns= ;; > + * ) ignore_dns=-D > +esac > + > +version_params= > +if [ "$NFS3_SERVER_SUPPORT" == "no" ]; then > + version_params="--no-nfs-version 2 --no-nfs-version 3" > +fi > +if [ "$NFS4_SUPPORT" != "yes" ]; then > + version_params="--no-nfs-version 4" > +fi > +if [ "$NFS4_SERVER_MINOR_VERSION" != "0" ]; then > + version_params="$VERSION_PARAMS --nfs-version 4 --nfs-version 4.$NFS4_SERVER_MINOR_VERSION" > +fi > + > +if [ "$USE_KERNEL_NFSD_NUMBER" -gt 0 ]; then > + threads=$USE_KERNEL_NFSD_NUMBER > +else > + threads=3 > +fi > + > +case $NFS_GSSD_AVOID_DNS in > + [Nn]*) ignore_dns=-D ;; > + [Yy]*) ignore_dns= ;; > + * ) ignore_dns=-D > +esac > + > +mkdir -p /run/sysconfig > +{ > +echo "RPCIDMAPDARGS=$pipefs" > +echo "RPCMOUNTDARGS=$mountdport $MOUNTD_OPTIONS $version_parms" > +echo "RPCNFSDARGS=$NFSD_OPTIONS $version_params $threads" > +echo "GSSDARGS=$ignore_dns $GSSD_OPTIONS $pipefs" > +echo "SMNOTIFYARGS=$SM_NOTIFY_OPTIONS" > +echo "STATDARGS=$STATD_OPTIONS" > +echo "SVCGSSDARGS=$SVCGSSD_OPTIONS" > +} > /run/sysconfig/nfs-utils > > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, 23 Mar 2014 15:14:44 -0400 Steve Dickson <SteveD@redhat.com> wrote: > > > On 02/20/2014 01:55 AM, Neil Brown wrote: > > This script provides the required translation for > > sysconfig variables understood by init.d script on openSUSE. > > > > Signed-off-by: NeilBrown <neilb@suse.de> > > --- > > systemd/SUSE-nfs-utils_env.sh | 62 +++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 62 insertions(+) > > create mode 100644 systemd/SUSE-nfs-utils_env.sh > I was thinking about this one too... Yeah, I know.. I need life!! ;-) > > Do we really want distro specific files like this in the upstream repo? > Its more of a maintenance thing than anything... If something distro > specific changes, do we really need to send the change upstream and > does upstream really care? Probably not. I mainly added that as an example as there seems to be some confusion over how I imagined these things working. I'm quite happy to not have this upstream (I might even prefer it). Thanks, NeilBrown > > steved. > > > > diff --git a/systemd/SUSE-nfs-utils_env.sh b/systemd/SUSE-nfs-utils_env.sh > > new file mode 100644 > > index 000000000000..8d6d94ed29e5 > > --- /dev/null > > +++ b/systemd/SUSE-nfs-utils_env.sh > > @@ -0,0 +1,62 @@ > > +#!/bin/sh > > + > > +# extract configuration from /etc/sysconfig/nfs-utils and write > > +# environment to /run/sysconfig/nfs-utils to be used by systemd unit > > +# files. > > +# This script expect configuration as used by openSUSE-13.1 and later > > +# > > + > > +nfs_config=/etc/sysconfig/nfs > > +if test -r $nfs_config; then > > + . $nfs_config > > +fi > > + > > +pipefs= > > +if [ -n "$RPC_PIPEFS_DIR" -a "$RPC_PIPEFS_DIR" != "/var/lib/nfs/rpc_pipefs" ]; then > > + pipefs="-p /var/lib/nfs/rpc_pipefs" > > +fi > > + > > +mountdport= > > +if [ -n "$MOUNTD_PORT" ]; then > > + mountdport="-p $MOUNTD_PORT" > > +fi > > + > > +case $NFS_GSSD_AVOID_DNS in > > + [Nn]*) ignore_dns=-D ;; > > + [Yy]*) ignore_dns= ;; > > + * ) ignore_dns=-D > > +esac > > + > > +version_params= > > +if [ "$NFS3_SERVER_SUPPORT" == "no" ]; then > > + version_params="--no-nfs-version 2 --no-nfs-version 3" > > +fi > > +if [ "$NFS4_SUPPORT" != "yes" ]; then > > + version_params="--no-nfs-version 4" > > +fi > > +if [ "$NFS4_SERVER_MINOR_VERSION" != "0" ]; then > > + version_params="$VERSION_PARAMS --nfs-version 4 --nfs-version 4.$NFS4_SERVER_MINOR_VERSION" > > +fi > > + > > +if [ "$USE_KERNEL_NFSD_NUMBER" -gt 0 ]; then > > + threads=$USE_KERNEL_NFSD_NUMBER > > +else > > + threads=3 > > +fi > > + > > +case $NFS_GSSD_AVOID_DNS in > > + [Nn]*) ignore_dns=-D ;; > > + [Yy]*) ignore_dns= ;; > > + * ) ignore_dns=-D > > +esac > > + > > +mkdir -p /run/sysconfig > > +{ > > +echo "RPCIDMAPDARGS=$pipefs" > > +echo "RPCMOUNTDARGS=$mountdport $MOUNTD_OPTIONS $version_parms" > > +echo "RPCNFSDARGS=$NFSD_OPTIONS $version_params $threads" > > +echo "GSSDARGS=$ignore_dns $GSSD_OPTIONS $pipefs" > > +echo "SMNOTIFYARGS=$SM_NOTIFY_OPTIONS" > > +echo "STATDARGS=$STATD_OPTIONS" > > +echo "SVCGSSDARGS=$SVCGSSD_OPTIONS" > > +} > /run/sysconfig/nfs-utils > > > >
diff --git a/systemd/SUSE-nfs-utils_env.sh b/systemd/SUSE-nfs-utils_env.sh new file mode 100644 index 000000000000..8d6d94ed29e5 --- /dev/null +++ b/systemd/SUSE-nfs-utils_env.sh @@ -0,0 +1,62 @@ +#!/bin/sh + +# extract configuration from /etc/sysconfig/nfs-utils and write +# environment to /run/sysconfig/nfs-utils to be used by systemd unit +# files. +# This script expect configuration as used by openSUSE-13.1 and later +# + +nfs_config=/etc/sysconfig/nfs +if test -r $nfs_config; then + . $nfs_config +fi + +pipefs= +if [ -n "$RPC_PIPEFS_DIR" -a "$RPC_PIPEFS_DIR" != "/var/lib/nfs/rpc_pipefs" ]; then + pipefs="-p /var/lib/nfs/rpc_pipefs" +fi + +mountdport= +if [ -n "$MOUNTD_PORT" ]; then + mountdport="-p $MOUNTD_PORT" +fi + +case $NFS_GSSD_AVOID_DNS in + [Nn]*) ignore_dns=-D ;; + [Yy]*) ignore_dns= ;; + * ) ignore_dns=-D +esac + +version_params= +if [ "$NFS3_SERVER_SUPPORT" == "no" ]; then + version_params="--no-nfs-version 2 --no-nfs-version 3" +fi +if [ "$NFS4_SUPPORT" != "yes" ]; then + version_params="--no-nfs-version 4" +fi +if [ "$NFS4_SERVER_MINOR_VERSION" != "0" ]; then + version_params="$VERSION_PARAMS --nfs-version 4 --nfs-version 4.$NFS4_SERVER_MINOR_VERSION" +fi + +if [ "$USE_KERNEL_NFSD_NUMBER" -gt 0 ]; then + threads=$USE_KERNEL_NFSD_NUMBER +else + threads=3 +fi + +case $NFS_GSSD_AVOID_DNS in + [Nn]*) ignore_dns=-D ;; + [Yy]*) ignore_dns= ;; + * ) ignore_dns=-D +esac + +mkdir -p /run/sysconfig +{ +echo "RPCIDMAPDARGS=$pipefs" +echo "RPCMOUNTDARGS=$mountdport $MOUNTD_OPTIONS $version_parms" +echo "RPCNFSDARGS=$NFSD_OPTIONS $version_params $threads" +echo "GSSDARGS=$ignore_dns $GSSD_OPTIONS $pipefs" +echo "SMNOTIFYARGS=$SM_NOTIFY_OPTIONS" +echo "STATDARGS=$STATD_OPTIONS" +echo "SVCGSSDARGS=$SVCGSSD_OPTIONS" +} > /run/sysconfig/nfs-utils
This script provides the required translation for sysconfig variables understood by init.d script on openSUSE. Signed-off-by: NeilBrown <neilb@suse.de> --- systemd/SUSE-nfs-utils_env.sh | 62 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 systemd/SUSE-nfs-utils_env.sh -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html