Hello community, here is the log from the commit of package multipath-tools for openSUSE:Factory checked in at 2014-03-04 13:14:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/multipath-tools (Old) and /work/SRC/openSUSE:Factory/.multipath-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "multipath-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/multipath-tools/multipath-tools.changes 2014-02-17 07:18:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.multipath-tools.new/multipath-tools.changes 2014-03-04 13:14:10.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Feb 28 15:53:24 CET 2014 - h...@suse.de + +- Fixup spec file to correct rules permissions + +------------------------------------------------------------------- +Fri Feb 28 12:45:19 CET 2014 - h...@suse.de + +- Fixup 40-multipath.rules installation + +------------------------------------------------------------------- +Wed Feb 26 14:38:49 CET 2014 - h...@suse.de + +- Add 40-multipath.rules for dracut support + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.t0zycO/_old 2014-03-04 13:14:11.000000000 +0100 +++ /var/tmp/diff_new_pack.t0zycO/_new 2014-03-04 13:14:11.000000000 +0100 @@ -22,6 +22,7 @@ BuildRequires: libudev-devel BuildRequires: readline-devel BuildRequires: systemd-devel +BuildRequires: udev Url: http://christophe.varoqui.free.fr/ Requires: device-mapper Requires: kpartx @@ -147,7 +148,7 @@ %defattr(-,root,root) %doc AUTHOR COPYING README ChangeLog %doc multipath.conf* -%dir /%{_sysdir}/udev/rules.d +%{_udevrulesdir}/40-multipath.rules /%{_lib}/libmultipath.so.0 /%{_lib}/libmpathpersist.so.0 /%{_lib}/multipath @@ -171,9 +172,8 @@ %files -n kpartx %defattr(-,root,root) /sbin/kpartx -%dir /%{_sysdir}/udev -%config /%{_sysdir}/udev/rules.d/66-kpartx.rules -%config /%{_sysdir}/udev/rules.d/67-kpartx-compat.rules +%{_udevrulesdir}/66-kpartx.rules +%{_udevrulesdir}/67-kpartx-compat.rules /%{_sysdir}/udev/kpartx_id %{_mandir}/man8/kpartx.8* ++++++ multipath-tools-0.5.0-sles12.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.t0zycO/_old 2014-03-04 13:14:11.000000000 +0100 +++ /var/tmp/diff_new_pack.t0zycO/_new 2014-03-04 13:14:11.000000000 +0100 @@ -590,6 +590,25 @@ *q = '\0'; return bytes; } +diff --git a/multipath/Makefile b/multipath/Makefile +index 5e5958d..8960b1f 100644 +--- a/multipath/Makefile ++++ b/multipath/Makefile +@@ -25,11 +25,14 @@ 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)$(libudevdir)/rules.d ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/40-multipath.rules + + uninstall: + rm $(DESTDIR)$(bindir)/$(EXEC) + rm $(DESTDIR)$(mandir)/$(EXEC).8.gz + rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz ++ rm $(DESTDIR)$(libudevdir)/rules.d/40-multipath.rules + + clean: + rm -f core *.o $(EXEC) *.gz diff --git a/multipath/main.c b/multipath/main.c index 64c8fc5..d9e5abd 100644 --- a/multipath/main.c @@ -603,6 +622,24 @@ goto out; if (conf->verbosity > 2) +diff --git a/multipath/multipath.rules b/multipath/multipath.rules +new file mode 100644 +index 0000000..92caf0f +--- /dev/null ++++ b/multipath/multipath.rules +@@ -0,0 +1,12 @@ ++# Set DM_MULTIPATH_DEVICE_PATH if the device should be handled by multipath ++SUBSYSTEM!="block", GOTO="end_mpath" ++ ++ENV{MPATH_SBIN_PATH}="/sbin" ++TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin" ++ ++SUBSYSTEM=="block", ACTION=="add", KERNEL!="dm-*", ENV{DEVTYPE}!="partition", \ ++ ENV{DM_MULTIPATH_DEVICE_PATH}!="1", \ ++ PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -c $tempnode", \ ++ ENV{DM_MULTIPATH_DEVICE_PATH}="1" ++ ++LABEL="end_mpath" diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c index f7fc522..11e01be 100644 --- a/multipathd/cli_handlers.c @@ -848,10 +885,25 @@ +fi diff --git a/rpm/multipath-tools.changes b/rpm/multipath-tools.changes new file mode 100644 -index 0000000..03d0d05 +index 0000000..2f21ff8 --- /dev/null +++ b/rpm/multipath-tools.changes -@@ -0,0 +1,1064 @@ +@@ -0,0 +1,1079 @@ ++------------------------------------------------------------------- ++Fri Feb 28 15:53:24 CET 2014 - h...@suse.de ++ ++- Fixup spec file to correct rules permissions ++ ++------------------------------------------------------------------- ++Fri Feb 28 12:45:19 CET 2014 - h...@suse.de ++ ++- Fixup 40-multipath.rules installation ++ ++------------------------------------------------------------------- ++Wed Feb 26 14:38:49 CET 2014 - h...@suse.de ++ ++- Add 40-multipath.rules for dracut support ++ +------------------------------------------------------------------- +Fri Feb 14 14:55:28 CET 2014 - h...@suse.de + @@ -1918,7 +1970,7 @@ +------------------------------------------------------------------- diff --git a/rpm/multipath-tools.spec b/rpm/multipath-tools.spec new file mode 100644 -index 0000000..85e170c +index 0000000..ad58f95 --- /dev/null +++ b/rpm/multipath-tools.spec @@ -0,0 +1,180 @@ @@ -1946,6 +1998,7 @@ +BuildRequires: libudev-devel +BuildRequires: readline-devel +BuildRequires: systemd-devel ++BuildRequires: udev +Url: http://christophe.varoqui.free.fr/ +Requires: device-mapper +Requires: kpartx @@ -2071,7 +2124,7 @@ +%defattr(-,root,root) +%doc AUTHOR COPYING README ChangeLog +%doc multipath.conf* -+%dir /%{_sysdir}/udev/rules.d ++%{_udevrulesdir}/40-multipath.rules +/%{_lib}/libmultipath.so.0 +/%{_lib}/libmpathpersist.so.0 +/%{_lib}/multipath @@ -2095,9 +2148,8 @@ +%files -n kpartx +%defattr(-,root,root) +/sbin/kpartx -+%dir /%{_sysdir}/udev -+%config /%{_sysdir}/udev/rules.d/66-kpartx.rules -+%config /%{_sysdir}/udev/rules.d/67-kpartx-compat.rules ++%{_udevrulesdir}/66-kpartx.rules ++%{_udevrulesdir}/67-kpartx-compat.rules +/%{_sysdir}/udev/kpartx_id +%{_mandir}/man8/kpartx.8* + -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
