Fix non-default statedir paths.
Subsystems (2)
PATCH 1/1 Fix non-default statedir paths.
---
configure.ac | 19 +++++++++++++++++++
systemd/Makefile.am | 5 ++++-
systemd/rpc-pipefs-generator.c | 2 +-
systemd/rpc_pipefs.target | 3 ---
systemd/rpc_pipefs.target.in | 3 +++
....mount => var-lib-nfs-rpc_pipefs.mount.in} | 2 +-
utils/blkmapd/device-discovery.c | 2 +-
utils/gssd/gssd.h | 2 +-
utils/idmapd/idmapd.c | 2 +-
9 files changed, 31 insertions(+), 9 deletions(-)
delete mode 100644 systemd/rpc_pipefs.target
create mode 100644 systemd/rpc_pipefs.target.in
rename systemd/{var-lib-nfs-rpc_pipefs.mount => var-lib-nfs-rpc_pipefs.mount.in} (84%)configure.ac +19 -0
@@ -688,9 +688,28 @@ AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) AC_SUBST([_sysconfdir]) AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir]) +# make _statedir available for substituion in config files +# 2 "evals" needed late to expand variable names. +AC_SUBST([_statedir]) +AC_CONFIG_COMMANDS_PRE([eval eval _statedir=$statedir]) + +if test "$statedir" = "/var/lib/nfs"; then + rpc_pipefsmount="var-lib-nfs-rpc_pipefs.mount" +else + rpc_pipefsmount="$(systemd-escape -p "$statedir/rpc_pipefs").mount" +fi +AC_SUBST(rpc_pipefsmount) + +# make _rpc_pipefsmount available for substituion in config files +# 2 "evals" needed late to expand variable names. +AC_SUBST([_rpc_pipefsmount]) +AC_CONFIG_COMMANDS_PRE([eval eval _rpc_pipefsmount=$rpc_pipefsmount]) + AC_CONFIG_FILES([ Makefile systemd/rpc-gssd.service + systemd/rpc_pipefs.target + systemd/var-lib-nfs-rpc_pipefs.mount linux-nfs/Makefile support/Makefile support/export/Makefile
systemd/Makefile.am +4 -1
@@ -12,7 +12,9 @@ unit_files = \ rpc-statd-notify.service \ rpc-statd.service \ \ - proc-fs-nfsd.mount \ + proc-fs-nfsd.mount + +rpc_pipefs_mount_file = \ var-lib-nfs-rpc_pipefs.mount if CONFIG_NFSV4
@@ -75,4 +77,5 @@ genexec_PROGRAMS = nfs-server-generator rpc-pipefs-generator install-data-hook: $(unit_files) mkdir -p $(DESTDIR)/$(unitdir) cp $(unit_files) $(DESTDIR)/$(unitdir) + cp $(rpc_pipefs_mount_file) $(DESTDIR)/$(unitdir)/$(rpc_pipefsmount) endif
systemd/rpc-pipefs-generator.c +1 -1
@@ -21,7 +21,7 @@#include "conffile.h" #include "systemd.h" -#define RPC_PIPEFS_DEFAULT "/var/lib/nfs/rpc_pipefs" +#define RPC_PIPEFS_DEFAULT NFS_STATEDIR "/rpc_pipefs"static int generate_mount_unit (const char *pipefs_path,const char *pipefs_unit,const char *dirname)
systemd/rpc_pipefs.target deleted +0 -3
@@ -1,3 +0,0 @@ -[Unit] -Requires=var-lib-nfs-rpc_pipefs.mount -After=var-lib-nfs-rpc_pipefs.mount
systemd/rpc_pipefs.target.in new file +3 -0
@@ -0,0 +1,3 @@ +[Unit] +Requires=@_rpc_pipefsmount@ +After=@_rpc_pipefsmount@
systemd/var-lib-nfs-rpc_pipefs.mount.in renamed from systemd/var-lib-nfs-rpc_pipefs.mount +1 -1
@@ -6,5 +6,5 @@ Conflicts=umount.target [Mount] What=sunrpc -Where=/var/lib/nfs/rpc_pipefs +Where=@_statedir@/rpc_pipefs Type=rpc_pipefs
utils/blkmapd/device-discovery.c +1 -1
@@ -63,7 +63,7 @@#define EVENT_SIZE (sizeof(struct inotify_event))#define EVENT_BUFSIZE (1024 * EVENT_SIZE) -#define RPCPIPE_DIR "/var/lib/nfs/rpc_pipefs" +#define RPCPIPE_DIR NFS_STATEDIR "/rpc_pipefs"#define PID_FILE "/run/blkmapd.pid"#define CONF_SAVE (w, f) do { \
utils/gssd/gssd.h +1 -1
@@ -39,7 +39,7 @@#include <pthread.h> #ifndef GSSD_PIPEFS_DIR -#define GSSD_PIPEFS_DIR "/var/lib/nfs/rpc_pipefs" +#define GSSD_PIPEFS_DIR NFS_STATEDIR "/rpc_pipefs"#endif #define DNOTIFY_SIGNAL (SIGRTMIN + 3)
utils/idmapd/idmapd.c +1 -1
@@ -73,7 +73,7 @@#include "nfslib.h" #ifndef PIPEFS_DIR -#define PIPEFS_DIR "/var/lib/nfs/rpc_pipefs/" +#define PIPEFS_DIR NFS_STATEDIR "/rpc_pipefs/"#endif #ifndef NFSD_DIR
Signature · 1 line
2.25.1
Hello,
My apologies for taking so long to look as this
patch...
What problem are you solving with this patch?
Your patch description is a bit light. ;-)
steved.
Quoted 155 lines · James Hilliard
Signed-off-by James Hilliard <[email protected]>--- configure.ac | 19 +++++++++++++++++++ systemd/Makefile.am | 5 ++++- systemd/rpc-pipefs-generator.c | 2 +- systemd/rpc_pipefs.target | 3 --- systemd/rpc_pipefs.target.in | 3 +++ ....mount => var-lib-nfs-rpc_pipefs.mount.in} | 2 +- utils/blkmapd/device-discovery.c | 2 +- utils/gssd/gssd.h | 2 +- utils/idmapd/idmapd.c | 2 +- 9 files changed, 31 insertions(+), 9 deletions(-)delete mode 100644 systemd/rpc_pipefs.target
create mode 100644 systemd/rpc_pipefs.target.in
rename systemd/{var-lib-nfs-rpc_pipefs.mount => var-lib-nfs-rpc_pipefs.mount.in} (84%)configure.ac +19
-0@@ -688,9 +688,28 @@ AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) AC_SUBST([_sysconfdir]) AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir]) +# make _statedir available for substituion in config files +# 2 "evals" needed late to expand variable names. +AC_SUBST([_statedir]) +AC_CONFIG_COMMANDS_PRE([eval eval _statedir=$statedir]) + +if test "$statedir" = "/var/lib/nfs"; then + rpc_pipefsmount="var-lib-nfs-rpc_pipefs.mount" +else + rpc_pipefsmount="$(systemd-escape -p "$statedir/rpc_pipefs").mount" +fi +AC_SUBST(rpc_pipefsmount) + +# make _rpc_pipefsmount available for substituion in config files +# 2 "evals" needed late to expand variable names. +AC_SUBST([_rpc_pipefsmount]) +AC_CONFIG_COMMANDS_PRE([eval eval _rpc_pipefsmount=$rpc_pipefsmount]) + AC_CONFIG_FILES([ Makefile systemd/rpc-gssd.service + systemd/rpc_pipefs.target + systemd/var-lib-nfs-rpc_pipefs.mount linux-nfs/Makefile support/Makefile support/export/Makefilesystemd/Makefile.am +4
-1@@ -12,7 +12,9 @@ unit_files = \ rpc-statd-notify.service \ rpc-statd.service \ \ - proc-fs-nfsd.mount \ + proc-fs-nfsd.mount + +rpc_pipefs_mount_file = \ var-lib-nfs-rpc_pipefs.mount if CONFIG_NFSV4@@ -75,4 +77,5 @@ genexec_PROGRAMS = nfs-server-generator rpc-pipefs-generator install-data-hook: $(unit_files) mkdir -p $(DESTDIR)/$(unitdir) cp $(unit_files) $(DESTDIR)/$(unitdir) + cp $(rpc_pipefs_mount_file) $(DESTDIR)/$(unitdir)/$(rpc_pipefsmount) endifsystemd/rpc-pipefs-generator.c +1
-1@@ -21,7 +21,7 @@#include "conffile.h" #include "systemd.h" -#define RPC_PIPEFS_DEFAULT "/var/lib/nfs/rpc_pipefs" +#define RPC_PIPEFS_DEFAULT NFS_STATEDIR "/rpc_pipefs"static int generate_mount_unit (const char *pipefs_path,const char *pipefs_unit,const char *dirname)systemd/rpc_pipefs.target deleted +0
-3@@ -1,3 +0,0 @@ -[Unit] -Requires=var-lib-nfs-rpc_pipefs.mount -After=var-lib-nfs-rpc_pipefs.mountsystemd/rpc_pipefs.target.in new file +3
-0@@ -0,0 +1,3 @@ +[Unit] +Requires=@_rpc_pipefsmount@ +After=@_rpc_pipefsmount@systemd/var-lib-nfs-rpc_pipefs.mount.in renamed from systemd/var-lib-nfs-rpc_pipefs.mount +1
-1@@ -6,5 +6,5 @@ Conflicts=umount.target [Mount] What=sunrpc -Where=/var/lib/nfs/rpc_pipefs +Where=@_statedir@/rpc_pipefs Type=rpc_pipefsutils/blkmapd/device-discovery.c +1
-1@@ -63,7 +63,7 @@#define EVENT_SIZE (sizeof(struct inotify_event))#define EVENT_BUFSIZE (1024 * EVENT_SIZE) -#define RPCPIPE_DIR "/var/lib/nfs/rpc_pipefs" +#define RPCPIPE_DIR NFS_STATEDIR "/rpc_pipefs"#define PID_FILE "/run/blkmapd.pid"#define CONF_SAVE (w, f) do { \utils/gssd/gssd.h +1
-1@@ -39,7 +39,7 @@#include <pthread.h> #ifndef GSSD_PIPEFS_DIR -#define GSSD_PIPEFS_DIR "/var/lib/nfs/rpc_pipefs" +#define GSSD_PIPEFS_DIR NFS_STATEDIR "/rpc_pipefs"#endif #define DNOTIFY_SIGNAL (SIGRTMIN + 3)utils/idmapd/idmapd.c +1
-1@@ -73,7 +73,7 @@#include "nfslib.h" #ifndef PIPEFS_DIR -#define PIPEFS_DIR "/var/lib/nfs/rpc_pipefs/" +#define PIPEFS_DIR NFS_STATEDIR "/rpc_pipefs/"#endif #ifndef NFSD_DIR
Quoted 7 lines · Steve Dickson
Hello,
My apologies for taking so long to look as this
patch...What problem are you solving with this patch?
The statedir path not being set everywhere needed, see:
https://github.com/clearlinux/distribution/issues/2249
https://github.com/clearlinux-pkgs/nfs-utils/commit/6c97e55ef83c1420e7d791c857ad94f2e8c27528
Quoted 160 lines
Your patch description is a bit light. ;-)
steved.
Quoted 155 lines · James Hilliard
Signed-off-by James Hilliard <[email protected]>--- configure.ac | 19 +++++++++++++++++++ systemd/Makefile.am | 5 ++++- systemd/rpc-pipefs-generator.c | 2 +- systemd/rpc_pipefs.target | 3 --- systemd/rpc_pipefs.target.in | 3 +++ ....mount => var-lib-nfs-rpc_pipefs.mount.in} | 2 +- utils/blkmapd/device-discovery.c | 2 +- utils/gssd/gssd.h | 2 +- utils/idmapd/idmapd.c | 2 +- 9 files changed, 31 insertions(+), 9 deletions(-)delete mode 100644 systemd/rpc_pipefs.target
create mode 100644 systemd/rpc_pipefs.target.in
rename systemd/{var-lib-nfs-rpc_pipefs.mount => var-lib-nfs-rpc_pipefs.mount.in} (84%)configure.ac +19
-0@@ -688,9 +688,28 @@ AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) AC_SUBST([_sysconfdir]) AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir]) +# make _statedir available for substituion in config files +# 2 "evals" needed late to expand variable names. +AC_SUBST([_statedir]) +AC_CONFIG_COMMANDS_PRE([eval eval _statedir=$statedir]) + +if test "$statedir" = "/var/lib/nfs"; then + rpc_pipefsmount="var-lib-nfs-rpc_pipefs.mount" +else + rpc_pipefsmount="$(systemd-escape -p "$statedir/rpc_pipefs").mount" +fi +AC_SUBST(rpc_pipefsmount) + +# make _rpc_pipefsmount available for substituion in config files +# 2 "evals" needed late to expand variable names. +AC_SUBST([_rpc_pipefsmount]) +AC_CONFIG_COMMANDS_PRE([eval eval _rpc_pipefsmount=$rpc_pipefsmount]) + AC_CONFIG_FILES([ Makefile systemd/rpc-gssd.service + systemd/rpc_pipefs.target + systemd/var-lib-nfs-rpc_pipefs.mount linux-nfs/Makefile support/Makefile support/export/Makefilesystemd/Makefile.am +4
-1@@ -12,7 +12,9 @@ unit_files = \ rpc-statd-notify.service \ rpc-statd.service \ \ - proc-fs-nfsd.mount \ + proc-fs-nfsd.mount + +rpc_pipefs_mount_file = \ var-lib-nfs-rpc_pipefs.mount if CONFIG_NFSV4@@ -75,4 +77,5 @@ genexec_PROGRAMS = nfs-server-generator rpc-pipefs-generator install-data-hook: $(unit_files) mkdir -p $(DESTDIR)/$(unitdir) cp $(unit_files) $(DESTDIR)/$(unitdir) + cp $(rpc_pipefs_mount_file) $(DESTDIR)/$(unitdir)/$(rpc_pipefsmount) endifsystemd/rpc-pipefs-generator.c +1
-1@@ -21,7 +21,7 @@#include "conffile.h" #include "systemd.h" -#define RPC_PIPEFS_DEFAULT "/var/lib/nfs/rpc_pipefs" +#define RPC_PIPEFS_DEFAULT NFS_STATEDIR "/rpc_pipefs"static int generate_mount_unit (const char *pipefs_path,const char *pipefs_unit,const char *dirname)systemd/rpc_pipefs.target deleted +0
-3@@ -1,3 +0,0 @@ -[Unit] -Requires=var-lib-nfs-rpc_pipefs.mount -After=var-lib-nfs-rpc_pipefs.mountsystemd/rpc_pipefs.target.in new file +3
-0@@ -0,0 +1,3 @@ +[Unit] +Requires=@_rpc_pipefsmount@ +After=@_rpc_pipefsmount@systemd/var-lib-nfs-rpc_pipefs.mount.in renamed from systemd/var-lib-nfs-rpc_pipefs.mount +1
-1@@ -6,5 +6,5 @@ Conflicts=umount.target [Mount] What=sunrpc -Where=/var/lib/nfs/rpc_pipefs +Where=@_statedir@/rpc_pipefs Type=rpc_pipefsutils/blkmapd/device-discovery.c +1
-1@@ -63,7 +63,7 @@#define EVENT_SIZE (sizeof(struct inotify_event))#define EVENT_BUFSIZE (1024 * EVENT_SIZE) -#define RPCPIPE_DIR "/var/lib/nfs/rpc_pipefs" +#define RPCPIPE_DIR NFS_STATEDIR "/rpc_pipefs"#define PID_FILE "/run/blkmapd.pid"#define CONF_SAVE (w, f) do { \utils/gssd/gssd.h +1
-1@@ -39,7 +39,7 @@#include <pthread.h> #ifndef GSSD_PIPEFS_DIR -#define GSSD_PIPEFS_DIR "/var/lib/nfs/rpc_pipefs" +#define GSSD_PIPEFS_DIR NFS_STATEDIR "/rpc_pipefs"#endif #define DNOTIFY_SIGNAL (SIGRTMIN + 3)utils/idmapd/idmapd.c +1
-1@@ -73,7 +73,7 @@#include "nfslib.h" #ifndef PIPEFS_DIR -#define PIPEFS_DIR "/var/lib/nfs/rpc_pipefs/" +#define PIPEFS_DIR NFS_STATEDIR "/rpc_pipefs/"#endif #ifndef NFSD_DIR
Quoted 1 line · James Hilliard
Signed-off-by James Hilliard <[email protected]>
Committed... (tag: nfs-utils-2-5-5-rc1)
steved
Quoted 154 lines
--- configure.ac | 19 +++++++++++++++++++ systemd/Makefile.am | 5 ++++- systemd/rpc-pipefs-generator.c | 2 +- systemd/rpc_pipefs.target | 3 --- systemd/rpc_pipefs.target.in | 3 +++ ....mount => var-lib-nfs-rpc_pipefs.mount.in} | 2 +- utils/blkmapd/device-discovery.c | 2 +- utils/gssd/gssd.h | 2 +- utils/idmapd/idmapd.c | 2 +- 9 files changed, 31 insertions(+), 9 deletions(-)delete mode 100644 systemd/rpc_pipefs.target
create mode 100644 systemd/rpc_pipefs.target.in
rename systemd/{var-lib-nfs-rpc_pipefs.mount => var-lib-nfs-rpc_pipefs.mount.in} (84%)configure.ac +19
-0@@ -688,9 +688,28 @@ AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) AC_SUBST([_sysconfdir]) AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir]) +# make _statedir available for substituion in config files +# 2 "evals" needed late to expand variable names. +AC_SUBST([_statedir]) +AC_CONFIG_COMMANDS_PRE([eval eval _statedir=$statedir]) + +if test "$statedir" = "/var/lib/nfs"; then + rpc_pipefsmount="var-lib-nfs-rpc_pipefs.mount" +else + rpc_pipefsmount="$(systemd-escape -p "$statedir/rpc_pipefs").mount" +fi +AC_SUBST(rpc_pipefsmount) + +# make _rpc_pipefsmount available for substituion in config files +# 2 "evals" needed late to expand variable names. +AC_SUBST([_rpc_pipefsmount]) +AC_CONFIG_COMMANDS_PRE([eval eval _rpc_pipefsmount=$rpc_pipefsmount]) + AC_CONFIG_FILES([ Makefile systemd/rpc-gssd.service + systemd/rpc_pipefs.target + systemd/var-lib-nfs-rpc_pipefs.mount linux-nfs/Makefile support/Makefile support/export/Makefilesystemd/Makefile.am +4
-1@@ -12,7 +12,9 @@ unit_files = \ rpc-statd-notify.service \ rpc-statd.service \ \ - proc-fs-nfsd.mount \ + proc-fs-nfsd.mount + +rpc_pipefs_mount_file = \ var-lib-nfs-rpc_pipefs.mount if CONFIG_NFSV4@@ -75,4 +77,5 @@ genexec_PROGRAMS = nfs-server-generator rpc-pipefs-generator install-data-hook: $(unit_files) mkdir -p $(DESTDIR)/$(unitdir) cp $(unit_files) $(DESTDIR)/$(unitdir) + cp $(rpc_pipefs_mount_file) $(DESTDIR)/$(unitdir)/$(rpc_pipefsmount) endifsystemd/rpc-pipefs-generator.c +1
-1@@ -21,7 +21,7 @@#include "conffile.h" #include "systemd.h" -#define RPC_PIPEFS_DEFAULT "/var/lib/nfs/rpc_pipefs" +#define RPC_PIPEFS_DEFAULT NFS_STATEDIR "/rpc_pipefs"static int generate_mount_unit (const char *pipefs_path,const char *pipefs_unit,const char *dirname)systemd/rpc_pipefs.target deleted +0
-3@@ -1,3 +0,0 @@ -[Unit] -Requires=var-lib-nfs-rpc_pipefs.mount -After=var-lib-nfs-rpc_pipefs.mountsystemd/rpc_pipefs.target.in new file +3
-0@@ -0,0 +1,3 @@ +[Unit] +Requires=@_rpc_pipefsmount@ +After=@_rpc_pipefsmount@systemd/var-lib-nfs-rpc_pipefs.mount.in renamed from systemd/var-lib-nfs-rpc_pipefs.mount +1
-1@@ -6,5 +6,5 @@ Conflicts=umount.target [Mount] What=sunrpc -Where=/var/lib/nfs/rpc_pipefs +Where=@_statedir@/rpc_pipefs Type=rpc_pipefsutils/blkmapd/device-discovery.c +1
-1@@ -63,7 +63,7 @@#define EVENT_SIZE (sizeof(struct inotify_event))#define EVENT_BUFSIZE (1024 * EVENT_SIZE) -#define RPCPIPE_DIR "/var/lib/nfs/rpc_pipefs" +#define RPCPIPE_DIR NFS_STATEDIR "/rpc_pipefs"#define PID_FILE "/run/blkmapd.pid"#define CONF_SAVE (w, f) do { \utils/gssd/gssd.h +1
-1@@ -39,7 +39,7 @@#include <pthread.h> #ifndef GSSD_PIPEFS_DIR -#define GSSD_PIPEFS_DIR "/var/lib/nfs/rpc_pipefs" +#define GSSD_PIPEFS_DIR NFS_STATEDIR "/rpc_pipefs"#endif #define DNOTIFY_SIGNAL (SIGRTMIN + 3)utils/idmapd/idmapd.c +1
-1@@ -73,7 +73,7 @@#include "nfslib.h" #ifndef PIPEFS_DIR -#define PIPEFS_DIR "/var/lib/nfs/rpc_pipefs/" +#define PIPEFS_DIR NFS_STATEDIR "/rpc_pipefs/"#endif #ifndef NFSD_DIR