projects / people / amarx / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| dc01aad8 SS |
1 | From 5a43356b54c2672441ce67cd9602904a5df04117 Mon Sep 17 00:00:00 2001 |
| 2 | From: Fabio M. Di Nitto <fdinitto@redhat.com> | |
| 3 | Date: Mon, 19 Oct 2009 07:07:01 +0200 | |
| 4 | Subject: [PATCH 10/12] RH: multipath rules + udev changes | |
| 5 | ||
| 6 | Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> | |
| 7 | --- | |
| 8 | :100644 100644 ac97749... 064196d... M multipath/multipath.rules | |
| 9 | multipath/Makefile | 6 +++--- | |
| 10 | multipath/multipath.rules | 18 +++++++++++------- | |
| 11 | 2 files changed, 14 insertions(+), 10 deletions(-) | |
| 12 | ||
| 13 | Index: multipath-tools/multipath/multipath.rules | |
| 14 | =================================================================== | |
| 15 | --- multipath-tools.orig/multipath/multipath.rules | |
| 16 | +++ multipath-tools/multipath/multipath.rules | |
| 17 | @@ -1,7 +1,11 @@ | |
| 18 | -# | |
| 19 | -# udev rules for multipathing. | |
| 20 | -# The persistent symlinks are created with the kpartx rules | |
| 21 | -# | |
| 22 | - | |
| 23 | -# socket for uevents | |
| 24 | -SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event" | |
| 25 | +# multipath wants the devmaps presented as meaninglful device names | |
| 26 | +# so name them after their devmap name | |
| 27 | +SUBSYSTEM!="block", GOTO="end_mpath" | |
| 28 | +RUN+="socket:/org/kernel/dm/multipath_event" | |
| 29 | +KERNEL!="dm-*", GOTO="end_mpath" | |
| 30 | +ACTION!="change", GOTO="end_mpath" | |
| 31 | +ENV{DM_SUSPENDED}=="1", GOTO="end_mpath" | |
| 32 | +ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath" | |
| 33 | +ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath" | |
| 34 | +RUN+="$env{DM_SBIN_PATH}/kpartx -a -p p $tempnode" | |
| 35 | +LABEL="end_mpath" | |
| 36 | Index: multipath-tools/multipath/Makefile | |
| 37 | =================================================================== | |
| 38 | --- multipath-tools.orig/multipath/Makefile | |
| 39 | +++ multipath-tools/multipath/Makefile | |
| 40 | @@ -21,15 +21,15 @@ $(EXEC): $(OBJS) | |
| 41 | install: | |
| 42 | $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) | |
| 43 | $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ | |
| 44 | - $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d | |
| 45 | - $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ | |
| 46 | + $(INSTALL_PROGRAM) -d $(DESTDIR)/lib/udev/rules.d | |
| 47 | + $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/lib/udev/rules.d/40-multipath.rules | |
| 48 | $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) | |
| 49 | $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) | |
| 50 | $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) | |
| 51 | $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) | |
| 52 | ||
| 53 | uninstall: | |
| 54 | - rm $(DESTDIR)/etc/udev/rules.d/multipath.rules | |
| 55 | + rm $(DESTDIR)/lib/udev/rules.d/multipath.rules | |
| 56 | rm $(DESTDIR)$(bindir)/$(EXEC) | |
| 57 | rm $(DESTDIR)$(mandir)/$(EXEC).8.gz | |
| 58 | rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz |