* [PATCH 0/4] Various small multipath-tools improvements
@ 2009-04-17 22:07 Mike Snitzer
2009-04-17 22:07 ` [PATCH 1/4] multipath-tools: update scsi_id arguments Mike Snitzer
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Mike Snitzer @ 2009-04-17 22:07 UTC (permalink / raw)
To: dm-devel
Just a few cleanup patches.
Mike Snitzer (4):
multipath-tools: update scsi_id arguments
multipath-tools: install libmultipath.so in $syslibdir
multipath-tools: update multipathd.init.redhat
multipath-tools: change default location for bindings file
Makefile.inc | 1 +
libmultipath/Makefile | 6 +-
libmultipath/defaults.h | 4 +-
libmultipath/hwtable.c | 6 +-
multipath.conf.annotated | 6 +-
multipath.conf.defaults | 78 ++++++++++++++++++------------------
multipath.conf.synthetic | 4 +-
multipath/Makefile | 1 +
multipath/multipath.conf.5 | 2 +-
multipathd/multipathd.init.redhat | 30 +++++++--------
10 files changed, 69 insertions(+), 69 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/4] multipath-tools: update scsi_id arguments 2009-04-17 22:07 [PATCH 0/4] Various small multipath-tools improvements Mike Snitzer @ 2009-04-17 22:07 ` Mike Snitzer 2009-04-17 22:07 ` [PATCH 2/4] multipath-tools: install libmultipath.so in $syslibdir Mike Snitzer ` (3 subsequent siblings) 4 siblings, 0 replies; 10+ messages in thread From: Mike Snitzer @ 2009-04-17 22:07 UTC (permalink / raw) To: dm-devel Switch over to using --whitelisted and --device Signed-off-by: Mike Snitzer <snitzer@redhat.com> --- libmultipath/defaults.h | 2 +- libmultipath/hwtable.c | 6 ++-- multipath.conf.annotated | 6 ++-- multipath.conf.defaults | 78 ++++++++++++++++++++++---------------------- multipath.conf.synthetic | 4 +- multipath/multipath.conf.5 | 2 +- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h index 87b155e..d7f93cb 100644 --- a/libmultipath/defaults.h +++ b/libmultipath/defaults.h @@ -1,4 +1,4 @@ -#define DEFAULT_GETUID "/lib/udev/scsi_id -g -u -d /dev/%n" +#define DEFAULT_GETUID "/lib/udev/scsi_id --whitelisted --device=/dev/%n" #define DEFAULT_UDEVDIR "/dev" #define DEFAULT_MULTIPATHDIR "/lib/multipath" #define DEFAULT_SELECTOR "round-robin 0" diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c index 1a51b19..52bced9 100644 --- a/libmultipath/hwtable.c +++ b/libmultipath/hwtable.c @@ -193,7 +193,7 @@ static struct hwentry default_hw[] = { /* HP Smart Array */ .vendor = "HP", .product = "LOGICAL VOLUME.*", - .getuid = "/lib/udev/scsi_id -n -g -u -d /dev/%n", + .getuid = DEFAULT_GETUID, .features = DEFAULT_FEATURES, .hwhandler = DEFAULT_HWHANDLER, .selector = DEFAULT_SELECTOR, @@ -235,7 +235,7 @@ static struct hwentry default_hw[] = { { .vendor = "EMC", .product = "SYMMETRIX", - .getuid = "/lib/udev/scsi_id -g -u -ppre-spc3-83 -d /dev/%n", + .getuid = "/lib/udev/scsi_id --page=pre-spc3-83 --whitelisted --device=/dev/%n", .features = DEFAULT_FEATURES, .hwhandler = DEFAULT_HWHANDLER, .selector = DEFAULT_SELECTOR, @@ -794,7 +794,7 @@ static struct hwentry default_hw[] = { { .vendor = "PIVOT3", .product = "RAIGE VOLUME", - .getuid = "/lib/udev/scsi_id -p 0x80 -g -u -d /dev/%n", + .getuid = "/lib/udev/scsi_id --page=0x80 --whitelisted --device=/dev/%n", .features = "1 queue_if_no_path", .hwhandler = DEFAULT_HWHANDLER, .selector = DEFAULT_SELECTOR, diff --git a/multipath.conf.annotated b/multipath.conf.annotated index 10aa5eb..7f5fe0d 100644 --- a/multipath.conf.annotated +++ b/multipath.conf.annotated @@ -55,9 +55,9 @@ # # scope : multipath # # desc : the default program and args to callout to obtain a unique # # path identifier. Absolute path required -# # default : /lib/udev/scsi_id -g -u -s +# # default : /lib/udev/scsi_id --whitelisted --device=/dev/%n # # -# getuid_callout "/lib/udev/scsi_id -g -u -d /dev/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # # # # # name : prio @@ -351,7 +351,7 @@ # # desc : the program and args to callout to obtain a unique # # path identifier. Absolute path required # # -# getuid_callout "/lib/udev/scsi_id -g -u -d /dev/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # # # # # name : prio diff --git a/multipath.conf.defaults b/multipath.conf.defaults index d2dfe2b..3651e40 100644 --- a/multipath.conf.defaults +++ b/multipath.conf.defaults @@ -6,7 +6,7 @@ # polling_interval 5 # selector "round-robin 0" # path_grouping_policy failover -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # prio const # path_checker directio # rr_min_io 1000 @@ -26,7 +26,7 @@ # device { # vendor "APPLE*" # product "Xserve RAID" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -39,7 +39,7 @@ # device { # vendor "3PARdata" # product "VV" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -52,7 +52,7 @@ # device { # vendor "DEC" # product "HSG80" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "1 queue_if_no_path" # hardware_handler "1 hp-sw" # path_selector "round-robin 0" @@ -65,7 +65,7 @@ # device { # vendor "HP" # product "A6189A" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -79,7 +79,7 @@ # device { # vendor "(COMPAQ|HP)" # product "(MSA|HSV)1.0.*" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "1 queue_if_no_path" # hardware_handler "1 hp-sw" # path_selector "round-robin 0" @@ -93,7 +93,7 @@ # device { # vendor "HP" # product "MSA VOLUME" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -123,7 +123,7 @@ # device { # vendor "(COMPAQ|HP)" # product "HSV1[01]1|HSV2[01]0|HSV300" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -138,7 +138,7 @@ # device { # vendor "HP" # product "MSA2[02]12*" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -153,7 +153,7 @@ # device { # vendor "HP" # product "LOGICAL VOLUME.*" -# getuid_callout "/lib/udev/scsi_id -n -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -168,7 +168,7 @@ # device { # vendor "DDN" # product "SAN DataDirector" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -181,7 +181,7 @@ # device { # vendor "EMC" # product "SYMMETRIX" -# getuid_callout "/lib/udev/scsi_id -g -u -ppre-spc3-83 -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --page=pre-spc3-83 --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -195,7 +195,7 @@ # vendor "DGC" # product ".*" # product_blacklist "LUNZ" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # prio_callout "/sbin/mpath_prio_emc /dev/%n" # features "1 queue_if_no_path" # hardware_handler "1 emc" @@ -211,7 +211,7 @@ # device { # vendor "FSC" # product "CentricStor" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -224,7 +224,7 @@ # device { # vendor "(HITACHI|HP)" # product "OPEN-.*" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "1 queue_if_no_path" # hardware_handler "0" # path_selector "round-robin 0" @@ -237,7 +237,7 @@ # device { # vendor "HITACHI" # product "DF.*" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "1 queue_if_no_path" # hardware_handler "0" # path_selector "round-robin 0" @@ -251,7 +251,7 @@ # device { # vendor "IBM" # product "ProFibre 4000R" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -264,7 +264,7 @@ # device { # vendor "IBM" # product "1722-600" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "1 queue_if_no_path" # hardware_handler "1 rdac" # path_selector "round-robin 0" @@ -279,7 +279,7 @@ # device { # vendor "IBM" # product "1742" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "1 rdac" # path_selector "round-robin 0" @@ -294,7 +294,7 @@ # device { # vendor "IBM" # product "1814" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "1 rdac" # path_selector "round-robin 0" @@ -309,7 +309,7 @@ # device { # vendor "IBM" # product "1815" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "1 rdac" # path_selector "round-robin 0" @@ -324,7 +324,7 @@ # device { # vendor "IBM" # product "3526" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "1 rdac" # path_selector "round-robin 0" @@ -339,7 +339,7 @@ # device { # vendor "IBM" # product "3542" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -352,7 +352,7 @@ # device { # vendor "IBM" # product "2105(800|F20)" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "1 queue_if_no_path" # hardware_handler "0" # path_selector "round-robin 0" @@ -365,7 +365,7 @@ # device { # vendor "IBM" # product "1750500" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "1 queue_if_no_path" # hardware_handler "0" # path_selector "round-robin 0" @@ -379,7 +379,7 @@ # device { # vendor "IBM" # product "2107900" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "1 queue_if_no_path" # hardware_handler "0" # path_selector "round-robin 0" @@ -392,7 +392,7 @@ # device { # vendor "IBM" # product "2145" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "1 queue_if_no_path" # hardware_handler "0" # path_selector "round-robin 0" @@ -407,7 +407,7 @@ # vendor "IBM" # product "S/390 DASD ECKD" # product_blacklist "S/390.*" -# getuid_callout "/sbin/dasdinfo -u -b %n" +# getuid_callout "/sbin/dasd_id /dev/%n" # features "1 queue_if_no_path" # hardware_handler "0" # path_selector "round-robin 0" @@ -420,7 +420,7 @@ # device { # vendor "NETAPP" # product "LUN.*" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "1 queue_if_no_path" # hardware_handler "0" # path_selector "round-robin 0" @@ -434,7 +434,7 @@ # device { # vendor "IBM" # product "Nseries.*" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "1 queue_if_no_path" # hardware_handler "0" # path_selector "round-robin 0" @@ -448,7 +448,7 @@ # device { # vendor "Pillar" # product "Axiom.*" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -461,7 +461,7 @@ # device { # vendor "SGI" # product "TP9[13]00" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -474,7 +474,7 @@ # device { # vendor "SGI" # product "TP9[45]00" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "1 rdac" # path_selector "round-robin 0" @@ -489,7 +489,7 @@ # device { # vendor "SGI" # product "IS.*" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "1 rdac" # path_selector "round-robin 0" @@ -504,7 +504,7 @@ # device { # vendor "STK" # product "OPENstorage D280" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -518,7 +518,7 @@ # device { # vendor "SUN" # product "(StorEdge 3510|T4)" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "0" # path_selector "round-robin 0" @@ -531,7 +531,7 @@ # device { # vendor "PIVOT3" # product "RAIGE VOLUME" -# getuid_callout "/sbin/scsi_id -p 0x80 -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --page=0x80 --device=/dev/%n" # features "1 queue_if_no_path" # hardware_handler "0" # path_selector "round-robin 0" @@ -544,7 +544,7 @@ # device { # vendor "SUN" # product "CSM200_R" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "1 rdac" # path_selector "round-robin 0" @@ -559,7 +559,7 @@ # device { # vendor "SUN" # product "LCSM100_F" -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # features "0" # hardware_handler "1 rdac" # path_selector "round-robin 0" diff --git a/multipath.conf.synthetic b/multipath.conf.synthetic index bf94c04..efa84f0 100644 --- a/multipath.conf.synthetic +++ b/multipath.conf.synthetic @@ -7,7 +7,7 @@ # polling_interval 10 # selector "round-robin 0" # path_grouping_policy multibus -# getuid_callout "/lib/udev/scsi_id -g -u -d /dev/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # prio const # path_checker directio # rr_min_io 100 @@ -52,7 +52,7 @@ # vendor "COMPAQ " # product "HSV110 (C)COMPAQ" # path_grouping_policy multibus -# getuid_callout "/lib/udev/scsi_id -g -u -d /dev/%n" +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # path_checker directio # path_selector "round-robin 0" # hardware_handler "0" diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5 index c02245c..057dd83 100644 --- a/multipath/multipath.conf.5 +++ b/multipath/multipath.conf.5 @@ -109,7 +109,7 @@ Default value is \fImultibus\fR. The default program and args to callout to obtain a unique path identifier. Should be specified with an absolute path. Default value is -.I /lib/udev/scsi_id -g -u -d /dev/%n +.I /lib/udev/scsi_id --whitelisted --device=/dev/%n .TP .B prio_callout The default program and args to callout to obtain a path priority -- 1.6.0.6 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/4] multipath-tools: install libmultipath.so in $syslibdir 2009-04-17 22:07 [PATCH 0/4] Various small multipath-tools improvements Mike Snitzer 2009-04-17 22:07 ` [PATCH 1/4] multipath-tools: update scsi_id arguments Mike Snitzer @ 2009-04-17 22:07 ` Mike Snitzer 2009-04-19 22:10 ` Christophe Varoqui 2009-04-17 22:07 ` [PATCH 3/4] multipath-tools: update multipathd.init.redhat Mike Snitzer ` (2 subsequent siblings) 4 siblings, 1 reply; 10+ messages in thread From: Mike Snitzer @ 2009-04-17 22:07 UTC (permalink / raw) To: dm-devel Allows libmultipath.so to be installed in the proper lib dir (e.g. /lib64). $libdir is already used for /lib/multipath Signed-off-by: Mike Snitzer <snitzer@redhat.com> --- Makefile.inc | 1 + libmultipath/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 3e5bca0..1fe9782 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -21,6 +21,7 @@ multipathdir = $(TOPDIR)/libmultipath mandir = $(prefix)/usr/share/man/man8 man5dir = $(prefix)/usr/share/man/man5 rcdir = $(prefix)/etc/init.d +syslibdir = $(prefix)/lib libdir = $(prefix)/lib/multipath GZIP = /bin/gzip -9 -c diff --git a/libmultipath/Makefile b/libmultipath/Makefile index 35cb911..503223d 100644 --- a/libmultipath/Makefile +++ b/libmultipath/Makefile @@ -26,12 +26,12 @@ $(LIBS): $(OBJS) $(CC) $(SHARED_FLAGS) -Wl,-soname,$@ $(CFLAGS) -o $@ $(OBJS) install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(prefix)/lib - $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(prefix)/lib/$(LIBS) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) + $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS) $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir) uninstall: - rm -f $(DESTDIR)$(prefix)/lib/$(LIBS) + rm -f $(DESTDIR)$(syslibdir)/$(LIBS) clean: rm -f core *.a *.o *.gz *.so -- 1.6.0.6 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/4] multipath-tools: install libmultipath.so in $syslibdir 2009-04-17 22:07 ` [PATCH 2/4] multipath-tools: install libmultipath.so in $syslibdir Mike Snitzer @ 2009-04-19 22:10 ` Christophe Varoqui 2009-04-19 22:36 ` Mike Snitzer 0 siblings, 1 reply; 10+ messages in thread From: Christophe Varoqui @ 2009-04-19 22:10 UTC (permalink / raw) To: device-mapper development Le vendredi 17 avril 2009 à 18:07 -0400, Mike Snitzer a écrit : > Allows libmultipath.so to be installed in the proper lib dir > (e.g. /lib64). $libdir is already used for /lib/multipath > Mike, am I missing something ... I don't the lib/lib64 switching code. > Signed-off-by: Mike Snitzer <snitzer@redhat.com> > --- > Makefile.inc | 1 + > libmultipath/Makefile | 6 +++--- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/Makefile.inc b/Makefile.inc > index 3e5bca0..1fe9782 100644 > --- a/Makefile.inc > +++ b/Makefile.inc > @@ -21,6 +21,7 @@ multipathdir = $(TOPDIR)/libmultipath > mandir = $(prefix)/usr/share/man/man8 > man5dir = $(prefix)/usr/share/man/man5 > rcdir = $(prefix)/etc/init.d > +syslibdir = $(prefix)/lib > libdir = $(prefix)/lib/multipath > > GZIP = /bin/gzip -9 -c > diff --git a/libmultipath/Makefile b/libmultipath/Makefile > index 35cb911..503223d 100644 > --- a/libmultipath/Makefile > +++ b/libmultipath/Makefile > @@ -26,12 +26,12 @@ $(LIBS): $(OBJS) > $(CC) $(SHARED_FLAGS) -Wl,-soname,$@ $(CFLAGS) -o $@ $(OBJS) > > install: > - $(INSTALL_PROGRAM) -d $(DESTDIR)$(prefix)/lib > - $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(prefix)/lib/$(LIBS) > + $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) > + $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS) > $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir) > > uninstall: > - rm -f $(DESTDIR)$(prefix)/lib/$(LIBS) > + rm -f $(DESTDIR)$(syslibdir)/$(LIBS) > > clean: > rm -f core *.a *.o *.gz *.so ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/4] multipath-tools: install libmultipath.so in $syslibdir 2009-04-19 22:10 ` Christophe Varoqui @ 2009-04-19 22:36 ` Mike Snitzer 2009-04-22 20:44 ` Christophe Varoqui 0 siblings, 1 reply; 10+ messages in thread From: Mike Snitzer @ 2009-04-19 22:36 UTC (permalink / raw) To: device-mapper development On Sun, Apr 19 2009 at 6:10pm -0400, Christophe Varoqui <christophe.varoqui@free.fr> wrote: > Le vendredi 17 avril 2009 à 18:07 -0400, Mike Snitzer a écrit : > > Allows libmultipath.so to be installed in the proper lib dir > > (e.g. /lib64). $libdir is already used for /lib/multipath > > > > Mike, > am I missing something ... I don't the lib/lib64 switching code. The standard install would still just place libmultipath.so in /lib but this patch exposes the ability to override the default e.g.: make install syslibdir=/lib64 libdir=/lib64/multipath The path checker and prioritizer modules would get installed in /lib64/multipath and libmultipath.so in /lib64 > > --- > > Makefile.inc | 1 + > > libmultipath/Makefile | 6 +++--- > > 2 files changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/Makefile.inc b/Makefile.inc > > index 3e5bca0..1fe9782 100644 > > --- a/Makefile.inc > > +++ b/Makefile.inc > > @@ -21,6 +21,7 @@ multipathdir = $(TOPDIR)/libmultipath > > mandir = $(prefix)/usr/share/man/man8 > > man5dir = $(prefix)/usr/share/man/man5 > > rcdir = $(prefix)/etc/init.d > > +syslibdir = $(prefix)/lib > > libdir = $(prefix)/lib/multipath > > > > GZIP = /bin/gzip -9 -c > > diff --git a/libmultipath/Makefile b/libmultipath/Makefile > > index 35cb911..503223d 100644 > > --- a/libmultipath/Makefile > > +++ b/libmultipath/Makefile > > @@ -26,12 +26,12 @@ $(LIBS): $(OBJS) > > $(CC) $(SHARED_FLAGS) -Wl,-soname,$@ $(CFLAGS) -o $@ $(OBJS) > > > > install: > > - $(INSTALL_PROGRAM) -d $(DESTDIR)$(prefix)/lib > > - $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(prefix)/lib/$(LIBS) > > + $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) > > + $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS) > > $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir) > > > > uninstall: > > - rm -f $(DESTDIR)$(prefix)/lib/$(LIBS) > > + rm -f $(DESTDIR)$(syslibdir)/$(LIBS) > > > > clean: > > rm -f core *.a *.o *.gz *.so > > -- > dm-devel mailing list > dm-devel@redhat.com > https://www.redhat.com/mailman/listinfo/dm-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Re: [PATCH 2/4] multipath-tools: install libmultipath.so in $syslibdir 2009-04-19 22:36 ` Mike Snitzer @ 2009-04-22 20:44 ` Christophe Varoqui 0 siblings, 0 replies; 10+ messages in thread From: Christophe Varoqui @ 2009-04-22 20:44 UTC (permalink / raw) To: device-mapper development > > > > Mike, > > am I missing something ... I don't the lib/lib64 switching code. > > The standard install would still just place libmultipath.so in /lib but > this patch exposes the ability to override the default e.g.: > make install syslibdir=/lib64 libdir=/lib64/multipath > > The path checker and prioritizer modules would get installed in > /lib64/multipath and libmultipath.so in /lib64 > Oh ok, I was expecting some kind of detection code to set /lib64. I understand that this approach is sufficient for your packagers needs. Thanks for explaining. ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/4] multipath-tools: update multipathd.init.redhat 2009-04-17 22:07 [PATCH 0/4] Various small multipath-tools improvements Mike Snitzer 2009-04-17 22:07 ` [PATCH 1/4] multipath-tools: update scsi_id arguments Mike Snitzer 2009-04-17 22:07 ` [PATCH 2/4] multipath-tools: install libmultipath.so in $syslibdir Mike Snitzer @ 2009-04-17 22:07 ` Mike Snitzer 2009-04-17 22:08 ` [PATCH 4/4] multipath-tools: change default location for bindings file Mike Snitzer 2009-04-18 17:41 ` [PATCH 0/4] Various small multipath-tools improvements christophe.varoqui 4 siblings, 0 replies; 10+ messages in thread From: Mike Snitzer @ 2009-04-17 22:07 UTC (permalink / raw) To: dm-devel Various small improvements to Red Hat's multipathd initscript. Signed-off-by: Mike Snitzer <snitzer@redhat.com> --- multipathd/multipathd.init.redhat | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/multipathd/multipathd.init.redhat b/multipathd/multipathd.init.redhat index 4664212..ee776f0 100644 --- a/multipathd/multipathd.init.redhat +++ b/multipathd/multipathd.init.redhat @@ -1,13 +1,16 @@ #!/bin/bash - -# -# /etc/rc.d/init.d/multipathd # -# Starts the multipath daemon +# multipathd Starts the multipath daemon # # chkconfig: - 13 87 -# description: Manage device-mapper multipath devices -# processname: multipathd +# description: Manages device-mapper multipath devices + +### BEGIN INIT INFO +# Provides: multipathd +# Short-Description: Control multipathd +# Description: This service monitors and manages +# device-mapper multipath devices +### END INIT INFO DAEMON=/sbin/multipathd prog=`basename $DAEMON` @@ -16,14 +19,8 @@ lockdir=/var/lock/subsys sysconfig=/etc/sysconfig -system=redhat - -if [ $system = redhat ]; then - # Source function library. - . $initdir/functions -fi +. $initdir/functions -test -x $DAEMON || exit 0 test -r $sysconfig/$prog && . $sysconfig/$prog RETVAL=0 @@ -33,6 +30,7 @@ RETVAL=0 # start() { + test -x $DAEMON || exit 5 echo -n $"Starting $prog daemon: " daemon $DAEMON RETVAL=$? @@ -68,13 +66,13 @@ start) stop) stop ;; -reload) +force-reload|reload) reload ;; restart) restart ;; -condrestart) +condrestart|try-restart) if [ -f $lockdir/$prog ]; then restart fi @@ -85,7 +83,7 @@ status) ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" - RETVAL=1 + RETVAL=2 esac exit $RETVAL -- 1.6.0.6 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/4] multipath-tools: change default location for bindings file 2009-04-17 22:07 [PATCH 0/4] Various small multipath-tools improvements Mike Snitzer ` (2 preceding siblings ...) 2009-04-17 22:07 ` [PATCH 3/4] multipath-tools: update multipathd.init.redhat Mike Snitzer @ 2009-04-17 22:08 ` Mike Snitzer 2009-04-18 17:41 ` [PATCH 0/4] Various small multipath-tools improvements christophe.varoqui 4 siblings, 0 replies; 10+ messages in thread From: Mike Snitzer @ 2009-04-17 22:08 UTC (permalink / raw) To: dm-devel Change from /var/lib/multipath/bindings to /etc/multipath/bindings. On bootup, if /var is not on the same device as /, multipath may start up before /var is mounted. /etc will always be available. Use of /etc/multipath/ is to make selinux happy. Signed-off-by: Mike Snitzer <snitzer@redhat.com> --- libmultipath/defaults.h | 2 +- multipath/Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h index d7f93cb..4bd0a8b 100644 --- a/libmultipath/defaults.h +++ b/libmultipath/defaults.h @@ -18,6 +18,6 @@ #define DEFAULT_PIDFILE "/var/run/multipathd.pid" #define DEFAULT_SOCKET "/var/run/multipathd.sock" #define DEFAULT_CONFIGFILE "/etc/multipath.conf" -#define DEFAULT_BINDINGS_FILE "/var/lib/multipath/bindings" +#define DEFAULT_BINDINGS_FILE "/etc/multipath/bindings" char * set_default (char * str); diff --git a/multipath/Makefile b/multipath/Makefile index e0031a2..1f48a8f 100644 --- a/multipath/Makefile +++ b/multipath/Makefile @@ -27,6 +27,7 @@ install: $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) + $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/multipath uninstall: rm $(DESTDIR)/etc/udev/rules.d/multipath.rules -- 1.6.0.6 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 0/4] Various small multipath-tools improvements 2009-04-17 22:07 [PATCH 0/4] Various small multipath-tools improvements Mike Snitzer ` (3 preceding siblings ...) 2009-04-17 22:08 ` [PATCH 4/4] multipath-tools: change default location for bindings file Mike Snitzer @ 2009-04-18 17:41 ` christophe.varoqui 2009-04-18 17:53 ` Mike Snitzer 4 siblings, 1 reply; 10+ messages in thread From: christophe.varoqui @ 2009-04-18 17:41 UTC (permalink / raw) To: device-mapper development Hi Mike, thank you for these patches. Do you happen to have a fetchable git clone to ease integration ? ----- Mail Original ----- De: "Mike Snitzer" <snitzer@redhat.com> À: dm-devel@redhat.com Envoyé: Samedi 18 Avril 2009 00h07:56 GMT +01:00 Amsterdam / Berlin / Berne / Rome / Stockholm / Vienne Objet: [dm-devel] [PATCH 0/4] Various small multipath-tools improvements Just a few cleanup patches. Mike Snitzer (4): multipath-tools: update scsi_id arguments multipath-tools: install libmultipath.so in $syslibdir multipath-tools: update multipathd.init.redhat multipath-tools: change default location for bindings file Makefile.inc | 1 + libmultipath/Makefile | 6 +- libmultipath/defaults.h | 4 +- libmultipath/hwtable.c | 6 +- multipath.conf.annotated | 6 +- multipath.conf.defaults | 78 ++++++++++++++++++------------------ multipath.conf.synthetic | 4 +- multipath/Makefile | 1 + multipath/multipath.conf.5 | 2 +- multipathd/multipathd.init.redhat | 30 +++++++-------- 10 files changed, 69 insertions(+), 69 deletions(-) -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/4] Various small multipath-tools improvements 2009-04-18 17:41 ` [PATCH 0/4] Various small multipath-tools improvements christophe.varoqui @ 2009-04-18 17:53 ` Mike Snitzer 0 siblings, 0 replies; 10+ messages in thread From: Mike Snitzer @ 2009-04-18 17:53 UTC (permalink / raw) To: device-mapper development Hi Christophe, I don't have a public git tree at the moment but I can look to get one setup for future patches. The patches that I posted should apply cleanly to the current HEAD (49944a3d5). BTW, agk pointed out that moving the bindings file may require that some logic be added to migrate the old bindings to the new location. I haven't looked into it yet but will do so shortly. But for now it is probably safest to not apply the change to the bindings file location (patch 4). Mike On Sat, Apr 18 2009 at 1:41pm -0400, christophe.varoqui@free.fr <christophe.varoqui@free.fr> wrote: > Hi Mike, > thank you for these patches. > Do you happen to have a fetchable git clone to ease integration ? > > ----- Mail Original ----- > De: "Mike Snitzer" <snitzer@redhat.com> > À: dm-devel@redhat.com > Envoyé: Samedi 18 Avril 2009 00h07:56 GMT +01:00 Amsterdam / Berlin / Berne / Rome / Stockholm / Vienne > Objet: [dm-devel] [PATCH 0/4] Various small multipath-tools improvements > > Just a few cleanup patches. > > Mike Snitzer (4): > multipath-tools: update scsi_id arguments > multipath-tools: install libmultipath.so in $syslibdir > multipath-tools: update multipathd.init.redhat > multipath-tools: change default location for bindings file > > Makefile.inc | 1 + > libmultipath/Makefile | 6 +- > libmultipath/defaults.h | 4 +- > libmultipath/hwtable.c | 6 +- > multipath.conf.annotated | 6 +- > multipath.conf.defaults | 78 ++++++++++++++++++------------------ > multipath.conf.synthetic | 4 +- > multipath/Makefile | 1 + > multipath/multipath.conf.5 | 2 +- > multipathd/multipathd.init.redhat | 30 +++++++-------- > 10 files changed, 69 insertions(+), 69 deletions(-) > > -- > dm-devel mailing list > dm-devel@redhat.com > https://www.redhat.com/mailman/listinfo/dm-devel > > -- > dm-devel mailing list > dm-devel@redhat.com > https://www.redhat.com/mailman/listinfo/dm-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2009-04-22 20:44 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2009-04-17 22:07 [PATCH 0/4] Various small multipath-tools improvements Mike Snitzer 2009-04-17 22:07 ` [PATCH 1/4] multipath-tools: update scsi_id arguments Mike Snitzer 2009-04-17 22:07 ` [PATCH 2/4] multipath-tools: install libmultipath.so in $syslibdir Mike Snitzer 2009-04-19 22:10 ` Christophe Varoqui 2009-04-19 22:36 ` Mike Snitzer 2009-04-22 20:44 ` Christophe Varoqui 2009-04-17 22:07 ` [PATCH 3/4] multipath-tools: update multipathd.init.redhat Mike Snitzer 2009-04-17 22:08 ` [PATCH 4/4] multipath-tools: change default location for bindings file Mike Snitzer 2009-04-18 17:41 ` [PATCH 0/4] Various small multipath-tools improvements christophe.varoqui 2009-04-18 17:53 ` Mike Snitzer
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.