Hello community, here is the log from the commit of package multipath-tools for openSUSE:Factory checked in at 2016-10-10 17:33:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-09-23 11:23:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.multipath-tools.new/multipath-tools.changes 2016-10-10 17:33:20.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Sep 29 06:04:00 UTC 2016 - [email protected] + +- Update to version 0.6.2+suse20160928.8939fb6 + +------------------------------------------------------------------- +Thu Sep 29 08:03:04 CEST 2016 - [email protected] + +- Implement support for 'multipath=off' and 'nompath' + kernel commandline options (bsc#1001691) + +------------------------------------------------------------------- +Wed Sep 28 13:26:55 CEST 2016 - [email protected] + +- multipath: avoid crash when using modified configuration + (bsc#1000914) + +------------------------------------------------------------------- Old: ---- multipath-tools-0.6.2+suse20160919.a385ea7.tar.xz New: ---- multipath-tools-0.6.2+suse20160928.8939fb6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.n8SvKT/_old 2016-10-10 17:33:21.000000000 +0200 +++ /var/tmp/diff_new_pack.n8SvKT/_new 2016-10-10 17:33:21.000000000 +0200 @@ -16,7 +16,7 @@ # -%define version_unconverted 0.6.2+suse20160919.a385ea7 +%define version_unconverted 0.6.2+suse20160928.8939fb6 Name: multipath-tools BuildRequires: device-mapper-devel @@ -31,7 +31,7 @@ Requires: device-mapper >= 1.2.78 Requires: kpartx PreReq: %insserv_prereq %fillup_prereq coreutils grep -Version: 0.6.2+suse20160919.a385ea7 +Version: 0.6.2+suse20160928.8939fb6 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.n8SvKT/_old 2016-10-10 17:33:21.000000000 +0200 +++ /var/tmp/diff_new_pack.n8SvKT/_new 2016-10-10 17:33:21.000000000 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/multipath-tools.git</param> - <param name="changesrevision">a385ea71b55a1ecb01afc121c372b1b9964b0744</param> + <param name="changesrevision">c560463067b27825167e63d9f6b52c90751bea98</param> </service> -</servicedata> +</servicedata> \ No newline at end of file ++++++ multipath-tools-0.6.2+suse20160919.a385ea7.tar.xz -> multipath-tools-0.6.2+suse20160928.8939fb6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.6.2+suse20160919.a385ea7/libmultipath/discovery.c new/multipath-tools-0.6.2+suse20160928.8939fb6/libmultipath/discovery.c --- old/multipath-tools-0.6.2+suse20160919.a385ea7/libmultipath/discovery.c 2016-09-19 15:24:12.000000000 +0200 +++ new/multipath-tools-0.6.2+suse20160928.8939fb6/libmultipath/discovery.c 2016-09-28 15:35:11.000000000 +0200 @@ -1653,7 +1653,7 @@ { int path_state; - if (!pp) + if (!pp || !conf) return PATHINFO_FAILED; condlog(3, "%s: mask = 0x%x", pp->dev, mask); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.6.2+suse20160919.a385ea7/multipath/main.c new/multipath-tools-0.6.2+suse20160928.8939fb6/multipath/main.c --- old/multipath-tools-0.6.2+suse20160919.a385ea7/multipath/main.c 2016-09-19 15:24:12.000000000 +0200 +++ new/multipath-tools-0.6.2+suse20160928.8939fb6/multipath/main.c 2016-09-28 15:35:11.000000000 +0200 @@ -265,7 +265,8 @@ * 1: Failure */ static int -configure (enum mpath_cmds cmd, enum devtypes dev_type, char *devpath) +configure (struct config *conf, enum mpath_cmds cmd, + enum devtypes dev_type, char *devpath) { vector curmp = NULL; vector pathvec = NULL; @@ -274,7 +275,6 @@ int di_flag = 0; char * refwwid = NULL; char * dev = NULL; - struct config *conf; /* * allocate core vectors to store paths and multipaths @@ -294,7 +294,6 @@ /* * if we have a blacklisted device parameter, exit early */ - conf = get_multipath_config(); if (dev && (dev_type == DEV_DEVNODE || dev_type == DEV_UEVENT) && cmd != CMD_REMOVE_WWID && @@ -303,10 +302,9 @@ if (cmd == CMD_VALID_PATH) printf("%s is not a valid multipath device path\n", devpath); - put_multipath_config(conf); goto out; } - put_multipath_config(conf); + /* * scope limiting must be translated into a wwid * failing the translation is fatal (by policy) @@ -722,7 +720,7 @@ r = dm_flush_maps(); goto out; } - while ((r = configure(cmd, dev_type, dev)) < 0) + while ((r = configure(conf, cmd, dev_type, dev)) < 0) condlog(3, "restart multipath configuration process"); out: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.6.2+suse20160919.a385ea7/multipath/multipath.rules new/multipath-tools-0.6.2+suse20160928.8939fb6/multipath/multipath.rules --- old/multipath-tools-0.6.2+suse20160919.a385ea7/multipath/multipath.rules 2016-09-19 15:24:12.000000000 +0200 +++ new/multipath-tools-0.6.2+suse20160928.8939fb6/multipath/multipath.rules 2016-09-28 15:35:11.000000000 +0200 @@ -3,6 +3,11 @@ ACTION!="add|change", GOTO="end_mpath" KERNEL!="sd*|dasd*", GOTO="end_mpath" +IMPORT{cmdline}="nompath" +ENV{nompath}=="?*", GOTO="end_mpath" +IMPORT{cmdline}="multipath" +ENV{multipath}=="off", GOTO="end_mpath" + ENV{DEVTYPE}!="partition", GOTO="test_dev" IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH" ENV{DM_MULTIPATH_DEVICE_PATH}=="1", ENV{ID_FS_TYPE}="none", \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.6.2+suse20160919.a385ea7/multipathd/multipathd.service new/multipath-tools-0.6.2+suse20160928.8939fb6/multipathd/multipathd.service --- old/multipath-tools-0.6.2+suse20160919.a385ea7/multipathd/multipathd.service 2016-09-19 15:24:12.000000000 +0200 +++ new/multipath-tools-0.6.2+suse20160928.8939fb6/multipathd/multipathd.service 2016-09-28 15:35:11.000000000 +0200 @@ -6,6 +6,8 @@ After=multipathd.socket systemd-udev-trigger.service systemd-udev-settle.service DefaultDependencies=no Conflicts=shutdown.target +ConditionKernelCommandLine=!nompath +ConditionKernelCommandLine=!multipath=off [Service] Type=notify
