diff options
Diffstat (limited to 'community-testing/multipath-tools')
10 files changed, 0 insertions, 824 deletions
diff --git a/community-testing/multipath-tools/PKGBUILD b/community-testing/multipath-tools/PKGBUILD deleted file mode 100644 index b4f134390..000000000 --- a/community-testing/multipath-tools/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 71548 2012-05-28 17:59:37Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Thomas S Hatch <thatch45 ar gmail dot com> -# Contributor: Michael P <ptchinster@archlinux.us> -# Contributor: Matt Heagney <matt@heagney.com> - -pkgname=multipath-tools -pkgver=0.4.9 -pkgrel=8 -pkgdesc='Multipath tools for Linux' -arch=('i686' 'x86_64') -url="http://christophe.varoqui.free.fr/" -license=('GPL') -depends=('libaio' 'device-mapper') -backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') -install=multipath-tools.install -options=(!emptydirs) -source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2 - multipath.conf multipath.conf.annotated multipathd.rc - fix-build.patch buffer-overflows.patch log_enquery_overflow.patch - blacklist-cciss-devices.patch explicitly-include-posix_types.h.patch) -md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765' - '9324ff0ba8330dcb21b2fcf64988026f' - 'be11462922eeeb9fcd2ba5f3f137b7d9' - '7c04ef96441363b0d43a2ebb13a87659' - '885c0ba9c90b73cc93aa3f78005f81d6' - 'c5aab36777b0304a3525533cdd31bddc' - '00eae05e02f1b85062e998574ab1b833' - '61b4038c4c145ca52e836145ea6bdd6c' - 'd99beb6d8a9b84f90125c7cacf8a6006') - -build() { - patch -Np1 -i fix-build.patch - patch -Np1 -i buffer-overflows.patch - patch -Np1 -i log_enquery_overflow.patch - patch -Np1 -i blacklist-cciss-devices.patch - patch -Np1 -i explicitly-include-posix_types.h.patch - - # Needs to be fixed upstream. Refer to - # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 - export LDFLAGS=${LDFLAGS/-Wl,--as-needed} - - make -} - -package() { - make LIB='usr/lib' DESTDIR="$pkgdir" bindir='/usr/bin' libudevdir='/usr/lib/udev' install - install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf - install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated - install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd -} diff --git a/community-testing/multipath-tools/blacklist-cciss-devices.patch b/community-testing/multipath-tools/blacklist-cciss-devices.patch deleted file mode 100644 index 497121c36..000000000 --- a/community-testing/multipath-tools/blacklist-cciss-devices.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> -Date: Fri, 3 Oct 2008 12:39:48 +0200 -Subject: [PATCH] blacklist cciss devices - -cciss support isn't complete in 0.4.8 and the half functioning causes -problems in d-i among other things. -Closes: #500991 ---- - libmultipath/blacklist.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c -index f369517..2e5efc8 100644 ---- a/libmultipath/blacklist.c -+++ b/libmultipath/blacklist.c -@@ -121,6 +121,12 @@ setup_default_blist (struct config * conf) - if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) - return 1; - -+ str = STRDUP("^cciss!c[0-9]d[0-9]*"); -+ if (!str) -+ return 1; -+ if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) -+ return 1; -+ - vector_foreach_slot (conf->hwtable, hwe, i) { - if (hwe->bl_product) { - if (alloc_ble_device(conf->blist_device)) --- diff --git a/community-testing/multipath-tools/buffer-overflows.patch b/community-testing/multipath-tools/buffer-overflows.patch deleted file mode 100644 index 38719aceb..000000000 --- a/community-testing/multipath-tools/buffer-overflows.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- multipath-tools-0.4.9.orig/libmultipath/prioritizers/datacore.c 2010-05-22 05:01:58.000000000 -0700 -+++ multipath-tools-0.4.9/libmultipath/prioritizers/datacore.c 2010-11-28 12:22:12.037228583 -0800 -@@ -94,7 +94,7 @@ - if ((io_hdr.info & SG_INFO_OK_MASK) != SG_INFO_OK) - return 0; - -- snprintf(vendor, 9, "%.8s\n", inqBuffp + 8); -+ snprintf(vendor, 8, "%.8s\n", inqBuffp + 8); - snprintf(product, 17, "%.16s", inqBuffp + 16); - snprintf(luname, 21, "%.19s", inqBuffp + 36); - snprintf(wwpn, 17, "%.16s", inqBuffp + 96); ---- multipath-tools-0.4.9.orig/libmultipath/prioritizers/hds.c 2010-05-22 05:01:58.000000000 -0700 -+++ multipath-tools-0.4.9/libmultipath/prioritizers/hds.c 2010-11-28 12:22:44.199483997 -0800 -@@ -123,7 +123,7 @@ - return -1; - } - -- snprintf (vendor, 9, "%.8s", inqBuffp + 8); -+ snprintf (vendor, 8, "%.8s", inqBuffp + 8); - snprintf (product, 17, "%.16s", inqBuffp + 16); - snprintf (serial, 5, "%.4s", inqBuffp + 40); - snprintf (ldev, 5, "%.4s", inqBuffp + 44); diff --git a/community-testing/multipath-tools/explicitly-include-posix_types.h.patch b/community-testing/multipath-tools/explicitly-include-posix_types.h.patch deleted file mode 100644 index 6cbbc3ba1..000000000 --- a/community-testing/multipath-tools/explicitly-include-posix_types.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> -Date: Sat, 5 Dec 2009 18:11:00 +0100 -Subject: [PATCH] explicitly include posix_types.h - -to get the correct type for __kernel_old_dev_t - -Closes: #558990 ---- - kpartx/lopart.c | 13 +------------ - 1 files changed, 1 insertions(+), 12 deletions(-) - -Index: mpath/kpartx/lopart.c -=================================================================== ---- mpath.orig/kpartx/lopart.c 2012-02-09 18:02:23.808800332 +0530 -+++ mpath/kpartx/lopart.c 2012-02-09 18:15:24.400671080 +0530 -@@ -26,18 +26,7 @@ - #include <sys/stat.h> - #include <sys/mman.h> - #include <sysmacros.h> -- --#if defined(__hppa__) || defined(__powerpc64__) || defined (__alpha__) \ -- || defined (__x86_64__) --typedef unsigned long __kernel_old_dev_t; --#elif defined(__powerpc__) || defined(__ia64__) || (defined(__sparc__) && defined (__arch64__)) --typedef unsigned int __kernel_old_dev_t; --#else --typedef unsigned short __kernel_old_dev_t; --#endif -- --#define dev_t __kernel_old_dev_t -- -+#include <asm/posix_types.h> - #include <linux/loop.h> - - #include "lopart.h" diff --git a/community-testing/multipath-tools/fix-build.patch b/community-testing/multipath-tools/fix-build.patch deleted file mode 100644 index ff8f6824c..000000000 --- a/community-testing/multipath-tools/fix-build.patch +++ /dev/null @@ -1,209 +0,0 @@ -diff -rupN upstream/Makefile.inc devel/Makefile.inc ---- upstream/Makefile.inc 2010-05-22 14:01:58.000000000 +0200 -+++ devel/Makefile.inc 2012-05-26 10:14:46.969786387 +0200 -@@ -32,11 +32,10 @@ rcdir = $(prefix)/etc/init.d - syslibdir = $(prefix)/$(LIB) - libdir = $(prefix)/$(LIB)/multipath - --GZIP = /bin/gzip -9 -c - INSTALL_PROGRAM = install - --OPTFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes --CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" -+OPTFLAGS = -Wall -Wunused -Wstrict-prototypes -+CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" - SHARED_FLAGS = -shared - - %.o: %.c -diff -rupN upstream/kpartx/Makefile devel/kpartx/Makefile ---- upstream/kpartx/Makefile 2010-05-22 14:01:58.000000000 +0200 -+++ devel/kpartx/Makefile 2012-05-26 10:23:38.909780754 +0200 -@@ -6,7 +6,7 @@ include ../Makefile.inc - - CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - --LDFLAGS = -ldevmapper -+LIBS = -ldevmapper - OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ - gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o - EXEC = kpartx -@@ -14,22 +14,22 @@ EXEC = kpartx - all: $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) - - install: $(EXEC) $(EXEC).8 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) - $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) -- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d -- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ -+ $(INSTALL_PROGRAM) -d $(DESTDIR)/usr/lib/udev/rules.d -+ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/usr/lib/udev/rules.d/66-kpartx.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - - uninstall: - rm -f $(DESTDIR)$(bindir)/$(EXEC) -- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz -+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 -+ rm -f $(DESTDIR)/usr/lib/udev/rules.d/66-kpartx.rules - - clean: -- rm -f core *.o $(EXEC) *.gz -+ rm -f core *.o $(EXEC) -diff -rupN upstream/kpartx/kpartx.rules devel/kpartx/kpartx.rules ---- upstream/kpartx/kpartx.rules 2010-05-22 14:01:58.000000000 +0200 -+++ devel/kpartx/kpartx.rules 2012-05-26 10:30:32.769776372 +0200 -@@ -27,9 +27,9 @@ ENV{DM_PART}=="?*", \ - - # Create dm tables for partitions - ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="mpath-*", \ -- RUN+="/sbin/kpartx -a -p -part /dev/$name" -+ RUN+="/usr/sbin/kpartx -a -p -part /dev/$name" - ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="dmraid-*", \ -- RUN+="/sbin/kpartx -a -p -part /dev/$name" -+ RUN+="/usr/sbin/kpartx -a -p -part /dev/$name" - - LABEL="kpartx_end" - -diff -rupN upstream/multipath/Makefile devel/multipath/Makefile ---- upstream/multipath/Makefile 2010-05-22 14:01:58.000000000 +0200 -+++ devel/multipath/Makefile 2012-05-26 10:22:38.819781391 +0200 -@@ -7,32 +7,30 @@ include ../Makefile.inc - OBJS = main.o - - CFLAGS += -I$(multipathdir) --LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) -+LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath - - EXEC = multipath - - all: $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) - - install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ -- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d -- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ -+ $(INSTALL_PROGRAM) -d $(DESTDIR)/usr/lib/udev/rules.d -+ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/usr/lib/udev/rules.d/65-multipath.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) - - uninstall: -- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules -- rm $(DESTDIR)$(bindir)/$(EXEC) -- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz -- rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz -+ rm -f $(DESTDIR)/usr/lib/udev/rules.d/65-multipath.rules -+ rm -f $(DESTDIR)$(bindir)/$(EXEC) -+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 -+ rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5 - - clean: -- rm -f core *.o $(EXEC) *.gz -+ rm -f core *.o $(EXEC) -diff -rupN upstream/multipath/multipath.rules devel/multipath/multipath.rules ---- upstream/multipath/multipath.rules 2010-05-22 14:01:58.000000000 +0200 -+++ devel/multipath/multipath.rules 2012-05-26 10:17:34.849784609 +0200 -@@ -1,7 +1,24 @@ --# --# udev rules for multipathing. --# The persistent symlinks are created with the kpartx rules --# -+# multipath wants the devmaps presented as meaninglful device names -+# so name them after their devmap name -+SUBSYSTEM!="block", GOTO="end_mpath" - --# socket for uevents --SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event" -+ENV{MPATH_SBIN_PATH}="/sbin" -+TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin" -+ -+ACTION=="add", ENV{DEVTYPE}!="partition", \ -+ ENV{DM_MULTIPATH_DEVICE_PATH}!="1", \ -+ PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -c $tempnode", \ -+ ENV{DM_MULTIPATH_DEVICE_PATH}="1" -+ -+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", ENV{DEVTYPE}!="partition", \ -+ RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}" -+ -+RUN+="socket:/org/kernel/dm/multipath_event" -+KERNEL!="dm-*", GOTO="end_mpath" -+ACTION!="change", GOTO="end_mpath" -+ENV{DM_UUID}=="mpath-?*|part[0-9]*-mpath-?*", OPTIONS+="link_priority=10" -+ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath" -+ENV{DM_SUSPENDED}=="1", GOTO="end_mpath" -+ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath" -+RUN+="$env{MPATH_SBIN_PATH}/kpartx -a -p p $tempnode" -+LABEL="end_mpath" -diff -rupN upstream/multipath-tools.spec.in devel/multipath-tools.spec.in ---- upstream/multipath-tools.spec.in 2010-05-22 14:01:58.000000000 +0200 -+++ devel/multipath-tools.spec.in 2012-05-26 10:24:16.989780353 +0200 -@@ -47,8 +47,8 @@ rm -rf $RPM_BUILD_ROOT - %{prefix}/usr/share/man/man8/multipathd.8.gz - %{prefix}/usr/share/man/man5/multipath.conf.5.gz - %{prefix}/sbin/multipathd --%{prefix}/etc/udev/rules.d/multipath.rules --%{prefix}/etc/udev/rules.d/kpartx.rules -+%{prefix}/usr/lib/udev/rules.d/multipath.rules -+%{prefix}/usr/lib/udev/rules.d/kpartx.rules - %{prefix}/lib/udev/kpartx_id - %{prefix}/lib/multipath/*.so - -diff -rupN upstream/multipathd/Makefile devel/multipathd/Makefile ---- upstream/multipathd/Makefile 2010-05-22 14:01:58.000000000 +0200 -+++ devel/multipathd/Makefile 2012-05-26 10:14:46.969786387 +0200 -@@ -6,8 +6,8 @@ include ../Makefile.inc - # basic flags setting - # - CFLAGS += -I$(multipathdir) --LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ -- -lmultipath -L$(multipathdir) -+LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \ -+ -L$(multipathdir) -lmultipath - - # - # debuging stuff -@@ -28,21 +28,20 @@ OBJS = main.o pidfile.o uxlsnr.o uxclnt. - all : $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) - - install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - - uninstall: - rm -f $(DESTDIR)$(bindir)/$(EXEC) - rm -f $(DESTDIR)$(rcdir)/$(EXEC) -- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz -+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 - - clean: -- rm -f core *.o $(EXEC) *.gz -+ rm -f core *.o $(EXEC) - diff --git a/community-testing/multipath-tools/log_enquery_overflow.patch b/community-testing/multipath-tools/log_enquery_overflow.patch deleted file mode 100644 index 67367c9f4..000000000 --- a/community-testing/multipath-tools/log_enquery_overflow.patch +++ /dev/null @@ -1,69 +0,0 @@ -From e1d69df0cdd1627676501df3a533b25ffadaeff0 Mon Sep 17 00:00:00 2001 -From: Arkadiusz Miskiewicz <arekm@maven.pl> -Date: Sat, 27 Nov 2010 19:21:21 +0100 -Subject: [PATCH] multipath-tools overflow - -On Saturday 27 of November 2010, you wrote: - -[...] - -> the whole logarea is memset to 0 by logarea_init(), and each dequeued -> message is also memset to 0 by log_dequeue(), so it seems normal that -> msg->str value is 0x0, but it's really its address that matters. - -Ok, got it. Pointers, memory areas in my debugging session - are looking -good then. - -> -> It's not clear to me : are you actually hitting a bug or is it your -> debug session that puzzles you ? - -I'm hitting a bug. multipathd dies for me at that strcpy(). Now I think -the bug is strcpy usage instead of memcpy because I'm building with --O2 -D_FORTIFY_SOURCE=2 which turns on special glibc overflow -detection. - -That detection seem to be smart enough to know that &str area is not -a string memory and aborts the program. - -Found similar problem discussed here -http://sourceware.org/ml/binutils/2005-11/msg00308.html - -glibc aborts the program: -[pid 13432] writev(2, [{"*** ", 4}, {"buffer overflow detected", 24}, -{" ***: ", 6}, {"/home/users/arekm/rpm/BUILD/multipath-tools-0.4.9 -/multipathd/multipathd", 71}, {" terminated\n", 12}], 5) = 117 - -same for valgrind: -**13436** *** strcpy_chk: buffer overflow detected ***: program terminated -==13436== at 0x4024997: VALGRIND_PRINTF_BACKTRACE (valgrind.h:4477) -==13436== by 0x40265F8: __strcpy_chk (mc_replace_strmem.c:781) -==13436== by 0x40EDC06: log_enqueue (string3.h:107) -==13436== by 0x40ED68A: log_safe (log_pthread.c:24) -==13436== by 0x40E296A: dlog (debug.c:36) -==13436== by 0x804ECEC: pidfile_create (pidfile.c:37) -==13436== by 0x804E731: main (main.c:1424) - -The bug is not visible if I run multipathd in debug mode (-d). - -This patch fixes the problem for me by avoiding false positive on strcpy_chk. ---- - libmultipath/log.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libmultipath/log.c b/libmultipath/log.c -index e56e46b..57b7696 100644 ---- a/libmultipath/log.c -+++ b/libmultipath/log.c -@@ -142,7 +142,7 @@ int log_enqueue (int prio, const char * fmt, va_list ap) - la->empty = 0; - msg = (struct logmsg *)la->tail; - msg->prio = prio; -- strcpy((void *)&msg->str, buff); -+ memcpy((void *)&msg->str, buff, strlen(buff) + 1); - lastmsg->next = la->tail; - msg->next = la->head; - --- -1.7.6.5 - diff --git a/community-testing/multipath-tools/multipath-tools.install b/community-testing/multipath-tools/multipath-tools.install deleted file mode 100644 index fa58bbc35..000000000 --- a/community-testing/multipath-tools/multipath-tools.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - - echo " * For full functonality ensure that the dm_multipath kernel module is loaded" -} diff --git a/community-testing/multipath-tools/multipath.conf b/community-testing/multipath-tools/multipath.conf deleted file mode 100644 index 6dacf093d..000000000 --- a/community-testing/multipath-tools/multipath.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Very Basic Multipath Configuration File -# - -defaults { - getuid_callout "/usr/lib/udev/scsi_id -g -u -d /dev/%n" -} - diff --git a/community-testing/multipath-tools/multipath.conf.annotated b/community-testing/multipath-tools/multipath.conf.annotated deleted file mode 100644 index b79488413..000000000 --- a/community-testing/multipath-tools/multipath.conf.annotated +++ /dev/null @@ -1,362 +0,0 @@ -## -## This is a template multipath-tools configuration file -## Uncomment the lines relevent to your environment -## -# -## -## name : defaults -## desc : multipath-tools default settings -## -#defaults { -# # -# # name : udev_dir -# # desc : directory where udev creates its device nodes -# # default : /dev -# # -# udev_dir /dev -# -# # -# # name : polling_interval -# # scope : multipathd -# # desc : interval between two path checks in seconds -# # default : 5 -# # -# polling_interval 10 -# -# # -# # name : selector -# # scope : multipath -# # desc : the default path selector algorithm to use -# # these algorithms are offered by the kernel multipath target -# # values : "round-robin 0" -# # default : "round-robin 0" -# # -# selector "round-robin 0" -# -# # -# # name : path_grouping_policy -# # scope : multipath -# # desc : the default path grouping policy to apply to unspecified -# # multipaths -# # default : multibus -# # -# path_grouping_policy multibus -# -# # -# # name : getuid_callout -# # scope : multipath -# # desc : the default program and args to callout to obtain a unique -# # path identifier. Absolute path required -# # default : /usr/lib/udev/scsi_id -g -u -s -# # -# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" -# -# # -# # name : prio_callout -# # scope : multipath -# # desc : the default program and args to callout to obtain a path -# # priority value. The ALUA bits in SPC-3 provide an -# # exploitable prio value for example. "none" is a valid value -# # default : (null) -# # -# #prio_callout "/bin/true" -# -# # -# # name : path_checker -# # scope : multipath & multipathd -# # desc : the default method used to determine the paths' state -# # values : readsector0|tur|emc_clariion|hp_sw|directio -# # default : directio -# # -# #path_checker directio -# -# # -# # name : rr_min_io -# # scope : multipath -# # desc : the number of IO to route to a path before switching -# # to the next in the same path group -# # default : 1000 -# # -# rr_min_io 100 -# -# # -# # name : rr_weight -# # scope : multipath -# # desc : if set to priorities the multipath configurator will assign -# # path weights as "path prio * rr_min_io" -# # values : priorities|uniform -# # default : uniform -# # -# rr_weight priorities -# -# # -# # name : failback -# # scope : multipathd -# # desc : tell the daemon to manage path group failback, or not to. -# # 0 means immediate failback, values >0 means deffered failback -# # expressed in seconds. -# # values : manual|immediate|n > 0 -# # default : immediate -# # -# failback manual -# -# # -# # name : no_path_retry -# # scope : multipath & multipathd -# # desc : tell the number of retries until disable queueing, or -# # "fail" means immediate failure (no queueing), -# # "queue" means never stop queueing -# # values : queue|fail|n (>0) -# # default : (null) -# # -# #no_path_retry queue -# -# # -# # name : user_friendly_names -# # scope : multipath -# # desc : If set to "yes", using the bindings file -# # /var/lib/multipath/bindings to assign a persistent and -# # unique alias to the multipath, in the form of mpath<n>. -# # If set to "no" use the WWID as the alias. In either case -# # this be will be overriden by any specific aliases in this -# # file. -# # values : yes|no -# # default : no -# user_friendly_names no -# -#} -# -## -## name : blacklist -## scope : multipath & multipathd -## desc : list of device names to discard as not multipath candidates -## default : cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop -## -#blacklist { -# wwid 26353900f02796769 -# devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*" -# devnode "^hd[a-z][[0-9]*]" -# devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]" -# device { -# vendor DEC.* -# product MSA[15]00 -# } -#} -## -## name : blacklist_exceptions -## scope : multipath & multipathd -## desc : list of device names to be treated as multipath candidates -## even if they are on the blacklist. -## Note: blacklist exceptions are only valid in the same class. -## It is not possible to blacklist devices using the devnode keyword -## and to exclude some devices of them using the wwid keyword. -## default : - -## -#blacklist_exceptions { -# devnode "^dasd[c-d]+[0-9]*" -# wwid "IBM.75000000092461.4d00.34" -# wwid "IBM.75000000092461.4d00.35" -# wwid "IBM.75000000092461.4d00.36" -#} -# -## -## name : multipaths -## scope : multipath & multipathd -## desc : list of multipaths finest-grained settings -## -#multipaths { -# # -# # name : multipath -# # scope : multipath & multipathd -# # desc : container for settings that apply to one specific multipath -# # -# multipath { -# # -# # name : wwid -# # scope : multipath & multipathd -# # desc : index of the container -# # -# wwid 3600508b4000156d700012000000b0000 -# -# # -# # name : alias -# # scope : multipath -# # desc : symbolic name for the multipath -# # -# alias yellow -# -# # -# # name : path_grouping_policy -# # scope : multipath -# # desc : path grouping policy to apply to this multipath -# # values : failover, multibus, group_by_serial -# # default : failover -# # -# path_grouping_policy multibus -# -# # -# # name : path_checker -# # scope : multipathd -# # desc : path checking alorithm to use to check path state -# # values : readsector0|tur|emc_clariion|hp_sw|directio -# # default : directio -# # -# # path_checker directio -# -# # -# # name : path_selector -# # desc : the path selector algorithm to use for this mpath -# # these algo are offered by the kernel mpath target -# # values : "round-robin 0" -# # default : "round-robin 0" -# # -# path_selector "round-robin 0" -# -# # -# # name : failback -# # scope : multipathd -# # desc : tell the daemon to manage path group failback, or not to. -# # 0 means immediate failback, values >0 means deffered failback -# # expressed in seconds. -# # values : manual|immediate|n > 0 -# # default : immediate -# # -# failback manual -# -# # -# # name : no_path_retry -# # scope : multipath & multipathd -# # desc : tell the number of retries until disable queueing, or -# # "fail" means immediate failure (no queueing), -# # "queue" means never stop queueing -# # values : queue|fail|n (>0) -# # default : (null) -# # -# #no_path_retry queue -# -# # -# # name : rr_min_io -# # scope : multipath -# # desc : the number of IO to route to a path before switching -# # to the next in the same path group -# # default : 1000 -# # -# rr_min_io 100 -# } -# multipath { -# wwid 1DEC_____321816758474 -# alias red -# rr_weight priorities -# } -#} -# -## -## name : devices -## scope : multipath & multipathd -## desc : list of per storage controller settings -## overrides default settings (device_maps block) -## overriden by per multipath settings (multipaths block) -## -#devices { -# # -# # name : device -# # scope : multipath & multipathd -# # desc : settings for this specific storage controller -# # -# device { -# # -# # name : vendor, product -# # scope : multipath & multipathd -# # desc : index for the block -# # -# vendor "COMPAQ " -# product "HSV110 (C)COMPAQ" -# -# # -# # name : path_grouping_policy -# # scope : multipath -# # desc : path grouping policy to apply to multipath hosted -# # by this storage controller -# # values : failover = 1 path per priority group -# # multibus = all valid paths in 1 priority -# # group -# # group_by_serial = 1 priority group per detected -# # serial number -# # default : failover -# # -# path_grouping_policy multibus -# -# # -# # name : getuid_callout -# # scope : multipath -# # desc : the program and args to callout to obtain a unique -# # path identifier. Absolute path required -# # default : /usr/lib/udev/scsi_id -g -u -s -# # -# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" -# -# # -# # name : prio_callout -# # scope : multipath -# # desc : the program and args to callout to obtain a path -# # weight. Weights are summed for each path group to -# # determine the next PG to use case of failure. -# # "none" is a valid value. -# # default : no callout, all paths equals -# # -# prio_callout "/sbin/mpath_prio_balance_units %d" -# -# # -# # name : path_checker -# # scope : multipathd -# # desc : path checking alorithm to use to check path state -# # values : readsector0|tur|emc_clariion|hp_sw|directio -# # default : directio -# # -# path_checker directio -# -# # -# # name : path_selector -# # desc : the path selector algorithm to use for this mpath -# # these algo are offered by the kernel mpath target -# # values : "round-robin 0" -# # default : "round-robin 0" -# # -# path_selector "round-robin 0" -# -# # -# # name : failback -# # scope : multipathd -# # desc : tell the daemon to manage path group failback, or not to. -# # 0 means immediate failback, values >0 means deffered failback -# # expressed in seconds. -# # values : manual|immediate|n > 0 -# # default : immediate -# # -# failback 30 -# -# # -# # name : rr_min_io -# # scope : multipath -# # desc : the number of IO to route to a path before switching -# # to the next in the same path group -# # default : 1000 -# # -# rr_min_io 100 -# -# # -# # name : product_blacklist -# # scope : multipath & multipathd -# # desc : product strings to blacklist for this vendor -# # default : none -# # -# product_blacklist LUN_Z -# } -# device { -# vendor "COMPAQ " -# product "MSA1000 " -# path_grouping_policy multibus -# path_checker tur -# rr_weight priorities -# } -#} diff --git a/community-testing/multipath-tools/multipathd.rc b/community-testing/multipath-tools/multipathd.rc deleted file mode 100644 index 7f5ef5d6a..000000000 --- a/community-testing/multipath-tools/multipathd.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting multipathd" - /usr/bin/multipathd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon multipathd - stat_done - fi - ;; - stop) - stat_busy "Stopping multipathd" - [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon multipathd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 |