debian/patches/unbreak-blkmapd-rpc_pipefs-run.patch

   1 From: Christoph Hellwig <hch@lst.de>
   2 Subject: nfs-common: move of rpc_pipefs mountpoint to /run breaks blkmapd
   3
   4 commit ba649fa4 ("Migrate the rpc_pipefs mount out of /var/lib to /run, to
   5 better support /var on NFS.") in the Debian packaging repo completely
   6 broke blkmapd, which still looks for rpc_pipefs in the old place.
   7 From looking in the BTS gssd also seems to have the same problem (#632141).
   8
   9 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828826
  10
  11 diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
  12 index 69f00fa..7b00c90 100644
  13 --- a/utils/blkmapd/device-discovery.c
  14 +++ b/utils/blkmapd/device-discovery.c
  15 @@ -55,9 +55,9 @@
  16  #define EVENT_SIZE (sizeof(struct inotify_event))
  17  #define EVENT_BUFSIZE (1024 * EVENT_SIZE)
  18
  19 -#define BL_PIPE_FILE   "/var/lib/nfs/rpc_pipefs/nfs/blocklayout"
  20 -#define NFSPIPE_DIR    "/var/lib/nfs/rpc_pipefs/nfs"
  21 -#define RPCPIPE_DIR    "/var/lib/nfs/rpc_pipefs"
  22 +#define BL_PIPE_FILE   "/run/rpc_pipefs/nfs/blocklayout"
  23 +#define NFSPIPE_DIR    "/run/rpc_pipefs/nfs"
  24 +#define RPCPIPE_DIR    "/run/rpc_pipefs"
  25  #define PID_FILE       "/run/blkmapd.pid"
  26
  27  struct bl_disk *visible_disk_list;
  28