[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] [PATCH 004/008] gnbd_export: convert harcoded DEFAULT_GETUID to build flag




-- 
I'm going to make him an offer he can't refuse.
#! /bin/sh /usr/share/dpatch/dpatch-run
## 004_gnbd_make_default_getuid_configurable.dpatch by  <fabbione gordian int fabbione net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad redhat-cluster-suite-2.20070427~/gnbd/tools/gnbd_export/Makefile redhat-cluster-suite-2.20070427/gnbd/tools/gnbd_export/Makefile
--- redhat-cluster-suite-2.20070427~/gnbd/tools/gnbd_export/Makefile	2007-04-27 08:01:15.000000000 +0200
+++ redhat-cluster-suite-2.20070427/gnbd/tools/gnbd_export/Makefile	2007-04-27 08:01:16.000000000 +0200
@@ -19,7 +19,7 @@
 	../../utils/gnbd_utils.o \
 	../../utils/trans.o
 
-CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\"
+CFLAGS += -DGNBD_RELEASE_NAME=\"${RELEASE}\" -DDEFAULT_GETUID=\"${sbindir}/gnbd_get_uid\"
 CFLAGS += -O2
 CFLAGS += -I${gnbdkincdir} -I${incdir} -I${cmanincdir}
 CFLAGS += -I../../include -I../../server -I../../utils
diff -urNad redhat-cluster-suite-2.20070427~/gnbd/tools/gnbd_export/gnbd_export.c redhat-cluster-suite-2.20070427/gnbd/tools/gnbd_export/gnbd_export.c
--- redhat-cluster-suite-2.20070427~/gnbd/tools/gnbd_export/gnbd_export.c	2007-04-27 08:01:14.000000000 +0200
+++ redhat-cluster-suite-2.20070427/gnbd/tools/gnbd_export/gnbd_export.c	2007-04-27 08:01:55.000000000 +0200
@@ -40,7 +40,6 @@
 #define TIMEOUT_DEFAULT 60
 
 #define MAN_MSG "Please see man page for details.\n"
-#define DEFAULT_GETUID "/sbin/gnbd_get_uid %n"
 
 int start_gnbd_clusterd(void)
 {
@@ -675,7 +674,7 @@
 "  -u <uid>         manually set the Unique ID of a device (used with -e)\n"
 "  -U[command]      command to get the Unique ID of a device (used with -e)\n"
 "                   If no command is specificed, the default is\n"
-"                   \"/sbin/gnbd_get_uid %%n\"\n"
+"                   \""DEFAULT_GETUID" %%n\"\n"
 "  -v               verbose output (useful with -l)\n"
 "  -V               version information\n");
   return 0;

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]