Hello community, here is the log from the commit of package lvm2 for openSUSE:Factory checked in at 2012-10-23 19:40:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lvm2 (Old) and /work/SRC/openSUSE:Factory/.lvm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lvm2", Maintainer is "dmzh...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lvm2/lvm2.changes 2012-10-18 10:15:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lvm2.new/lvm2.changes 2012-10-23 19:40:17.000000000 +0200 @@ -1,0 +2,21 @@ +Wed Oct 17 23:01:54 UTC 2012 - nfbr...@suse.com + +- lvm2.spec: merge rules for device-mapper and + lvm2-clvm packages, so there is only one + spec file and all packages are built consistently. + +------------------------------------------------------------------- +Tue Oct 16 09:34:40 UTC 2012 - co...@suse.com + +- build against the minimal udev to avoid cycles +- the sysvinit requires are no longer necessary + +------------------------------------------------------------------- +Tue Oct 16 04:19:59 UTC 2012 - nfbr...@suse.com + +- Upgrade to LVM2-2-02-98. Improvements include + improved interaction with udev and systemd, + improved dmraid support, and new command + "blkdeactivate". + +------------------------------------------------------------------- Old: ---- LVM2.2.02.84.tgz blkid-builtin.patch cmdline_large_minor.diff device-mapper-gcc-warning.diff device-mapper.changes device-mapper.spec k_dev_t.dif lvm-pv-create-link.diff lvm2-clvm.changes lvm2-clvm.spec New: ---- LVM2.2.02.98.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:38.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:38.000000000 +0200 @@ -19,19 +19,19 @@ Url: http://sources.redhat.com/cluster/clvm/ Name: lvm2 +BuildRequires: libcorosync-devel +BuildRequires: libdlm-devel +BuildRequires: libopenais-devel BuildRequires: libselinux-devel -BuildRequires: libudev-devel BuildRequires: readline-devel +BuildRequires: pkgconfig(udev) Requires: device-mapper >= 1.02.25 Provides: lvm PreReq: %fillup_prereq %insserv_prereq /sbin/mkinitrd -%if %suse_version > 1130 -PreReq: sysvinit(boot.device-mapper) -%endif -Version: 2.02.84 +Version: 2.02.98 Release: 0 -Summary: LVM2 Tools -License: GPL-2.0+ ; LGPL-2.1+ +Summary: Logical Volume Manager Tools +License: GPL-2.0+ and LGPL-2.1+ Group: System/Base Source: LVM2.%{version}.tgz Source1: lvm.conf @@ -42,23 +42,25 @@ Source6: 64-lvm2.rules Source7: collect_lvm Source8: clvmd.ocf +Source11: boot.device-mapper +Source12: mkinitrd-devmapper-setup.sh +Source13: mkinitrd-devmapper-boot.sh +Source14: baselibs.conf + Patch: improve_probing.diff Patch2: no-inc-audit.diff Patch3: no_buildroot_shared.diff Patch4: sys_mount_instead_linux_fs.diff -#Patch5: pvscan_2TB_limit.diff Patch6: man_page_sectors.diff -Patch11: cmdline_large_minor.diff + Patch13: pipe_buff-definition.diff -Patch14: lvm-pv-create-link.diff Patch19: dont_ignore_tmp_device_file.diff +Patch20: support-drbd-filter.diff Patch22: handle_extended_devt.diff -#Patch23: lvm2cmd-link-to-devmapper-event.diff -#Patches for device mapper -Patch60: k_dev_t.dif Patch61: device-mapper-dmsetup-export.patch -Patch62: device-mapper-gcc-warning.diff Patch65: device-mapper-dmsetup-deps-export.patch +Patch66: device-mapper-type_punning.diff +Patch70: sleep-try-open-count.diff Patch81: udev-rules_update.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,70 +82,70 @@ %prep %setup -n LVM2.%{version} -%patch +%patch -p1 %patch2 %patch3 %patch4 -#%patch5 -%patch6 -%patch11 -%patch13 -#%patch14 -p1 +%patch6 -p1 +%patch13 -p1 %patch19 -p1 +%patch20 -p1 %patch22 -p1 -#%patch23 -p1 -# patch to device-mapper -%patch60 -p1 %patch61 -p1 -%patch62 -p1 -#%patch63 -p1 %patch65 -p1 -#%patch80 -p0 +%patch66 -p1 +%patch70 -p1 %patch81 -p1 %build export MODPROBE_CMD=/sbin/modprobe %configure --prefix=/ \ - --bindir=/bin --libdir=/%_lib --with-userlibdir=%_libdir \ + --bindir=/bin --libdir=/%_lib --with-usrlibdir=%_libdir \ --sbindir=/sbin --enable-dmeventd \ --with-udevdir=/lib/udev/rules.d \ --with-dmeventd_path=/sbin/dmeventd \ - --enable-udev_sync --enable-udev_rules --enable-compat \ + --with-device-uid=0 --with-device-gid=6 --with-device-mode=0640 \ + --enable-udev_sync --enable-udev_rules \ --enable-cmdlib --enable-dmeventd \ - --enable-realtime --enable-pkgconfig + --enable-realtime --enable-pkgconfig \ + --enable-selinux \ + --with-clvmd=corosync --datarootdir=/usr/share export SUSE_ASNEEDED=0 -make %{?_smp_mflags} +make -j1 # symlinks are generated in parallel! %{?_smp_mflags} %install -make install_lvm2 DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT/etc/lvm install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/backup install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/archive install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/metadata -install -d -m 755 $RPM_BUILD_ROOT/var/lock/lvm install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/lvm mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d +install -m 744 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-lvm2.sh install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-lvm2.sh +install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-dm.sh +install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-dm.sh mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/var/adm/fillup-templates -[ %_lib != lib ] && mv $RPM_BUILD_ROOT/lib/liblvm2cmd.so $RPM_BUILD_ROOT/%_lib/liblvm2cmd.so -[ %_lib != lib ] && mv $RPM_BUILD_ROOT/lib/libdevmapper-event-lvm2.so $RPM_BUILD_ROOT/%_lib/libdevmapper-event-lvm2.so +install -m755 -D %{S:8} $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/lvm2/clvmd +rm -f $RPM_BUILD_ROOT/%_libdir/liblvm2cmd.so +ln -sf liblvm2cmd.so.2.02 $RPM_BUILD_ROOT/%_lib/liblvm2cmd.so +rm -f $RPM_BUILD_ROOT/%_libdir/libdevmapper-event-lvm2.so +ln -sf libdevmapper-event-lvm2.so.2.02 $RPM_BUILD_ROOT/%_lib/libdevmapper-event-lvm2.so pushd $RPM_BUILD_ROOT/%_lib ln -sf device-mapper/libdevmapper-event-lvm2mirror.so libdevmapper-event-lvm2mirror.so.2.02 ln -sf device-mapper/libdevmapper-event-lvm2snapshot.so libdevmapper-event-lvm2snapshot.so.2.02 +ln -sf device-mapper/libdevmapper-event-lvm2raid.so libdevmapper-event-lvm2raid.so.2.02 popd +install -d $RPM_BUILD_ROOT/usr/sbin +mv $RPM_BUILD_ROOT/sbin/clvmd $RPM_BUILD_ROOT/usr/sbin/clvmd mkdir -p $RPM_BUILD_ROOT/usr/share -mv $RPM_BUILD_ROOT/share/man $RPM_BUILD_ROOT/%{_mandir} -rmdir $RPM_BUILD_ROOT/share rm $RPM_BUILD_ROOT/usr/include/lvm2cmd.h -# install 64-lvm2.rules and collect_lvm -#install -m644 -D %{S:6} $RPM_BUILD_ROOT/lib/udev/rules.d/64-lvm2.rules +# install and collect_lvm install -m755 -D %{S:7} $RPM_BUILD_ROOT/lib/udev/collect_lvm -# remove all device mapper files -rm $RPM_BUILD_ROOT/%{_mandir}/man8/fsadm.* %post %{fillup_and_insserv -n lvm boot.lvm} @@ -174,12 +176,11 @@ %files %defattr(-,root,root) -%doc INSTALL README WHATS_NEW doc/* +%doc README WHATS_NEW doc/* %dir /etc/lvm %dir /etc/lvm/backup %dir /etc/lvm/archive %dir /etc/lvm/metadata -%dir /var/lock/lvm %config /etc/lvm/lvm.conf %config /etc/init.d/boot.lvm %dir /lib/mkinitrd @@ -192,6 +193,7 @@ /lib/mkinitrd/scripts/setup-lvm2.sh /lib/mkinitrd/scripts/boot-lvm2.sh /var/adm/fillup-templates/sysconfig.lvm +/sbin/blkdeactivate /sbin/fsadm /sbin/lvchange /sbin/lvconvert @@ -242,15 +244,20 @@ %dir /%_lib/device-mapper /%_lib/device-mapper/libdevmapper-event-lvm2mirror.so /%_lib/device-mapper/libdevmapper-event-lvm2snapshot.so +/%_lib/device-mapper/libdevmapper-event-lvm2raid.so /%_lib/libdevmapper-event-lvm2mirror.so /%_lib/libdevmapper-event-lvm2snapshot.so +/%_lib/libdevmapper-event-lvm2raid.so /%_lib/liblvm2cmd.so /%_lib/libdevmapper-event-lvm2mirror.so.2.02 /%_lib/libdevmapper-event-lvm2snapshot.so.2.02 +/%_lib/libdevmapper-event-lvm2raid.so.2.02 /%_lib/liblvm2cmd.so.2.02 /%_lib/libdevmapper-event-lvm2.so /%_lib/libdevmapper-event-lvm2.so.2.02 %{_mandir}/man5/lvm.conf.5.gz +%{_mandir}/man8/blkdeactivate.8.gz +%{_mandir}/man8/fsadm.8.gz %{_mandir}/man8/lvchange.8.gz %{_mandir}/man8/lvcreate.8.gz %{_mandir}/man8/lvconvert.8.gz @@ -298,4 +305,94 @@ %{_mandir}/man8/lvmsadc.8.gz %{_mandir}/man8/lvmsar.8.gz +%package -n device-mapper +# bug437293 +%ifarch ppc64 +Obsoletes: device-mapper-64bit +%endif +# +Version: 1.02.77 +Release: 0 +Url: ftp://sources.redhat.com/pub/lvm2/ +Summary: Device Mapper Tools +Group: System/Base + +%description -n device-mapper +Programs, libraries, and man pages for configuring and using the device +mapper. + +%post -n device-mapper +%{run_ldconfig} +[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup +%{insserv_cleanup} + +%postun -n device-mapper +%{run_ldconfig} +[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup +%{insserv_cleanup} + +%files -n device-mapper +%defattr(-,root,root) +%doc COPYING COPYING.LIB README VERSION_DM WHATS_NEW_DM +%config /etc/init.d/boot.device-mapper +/%_lib/libdevmapper.so.1.02 +/%_lib/libdevmapper-event.so.1.02 +%dir /lib/udev/rules.d +%dir /lib/udev +/lib/udev/rules.d/10-dm.rules +#/lib/udev/rules.d/12-dm-permissions.rules +/lib/udev/rules.d/13-dm-disk.rules +/lib/udev/rules.d/95-dm-notify.rules +/sbin/dmsetup +/sbin/dmeventd +%{_mandir}/man8/dmsetup.8.gz +%{_mandir}/man8/dmeventd.8.gz +%dir /lib/mkinitrd +%dir /lib/mkinitrd/scripts +/lib/mkinitrd/scripts/setup-dm.sh +/lib/mkinitrd/scripts/boot-dm.sh + +%package -n device-mapper-devel +Version: 1.02.77 +Release: 0 +Summary: Development package for the device mapper +Group: System/Base +Requires: device-mapper = 1.02.77 + +%description -n device-mapper-devel +Files needed for software development using the device mapper + +%files -n device-mapper-devel +%defattr(-,root,root) +/%_libdir/libdevmapper.so +/%_libdir/libdevmapper-event.so +/%_libdir/pkgconfig/*.pc +/usr/include/libdevmapper.h +/usr/include/libdevmapper-event.h + +%package clvm +Url: http://sources.redhat.com/cluster/clvm/ +Version: 2.02.98 +Release: 0 +Requires: device-mapper >= 1.02.25 +Requires: lvm2 = %{version} +Requires: openais +Provides: clvm +Summary: Clustered LVM2 +Group: System/Base + +%description clvm +A daemon for using LVM2 Logival Volumes in a clustered environment. + + + +%files clvm +%defattr(-,root,root) +/usr/sbin/clvmd +%dir /usr/lib/ocf +%dir /usr/lib/ocf/resource.d +%dir /usr/lib/ocf/resource.d/lvm2 +/usr/lib/ocf/resource.d/lvm2/clvmd +%{_mandir}/man8/clvmd.8.gz + %changelog ++++++ LVM2.2.02.84.tgz -> LVM2.2.02.98.tgz ++++++ ++++ 103676 lines of diff (skipped) ++++++ boot.device-mapper ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:39.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:39.000000000 +0200 @@ -10,6 +10,7 @@ # Required-Stop: boot.udev # Default-Start: B # Default-Stop: +# Short-Description: DM # Description: activate device mapper ### END INIT INFO @@ -27,6 +28,10 @@ rc_failed 3 rc_status -v ;; + reload) + rc_failed 3 + rc_status -v + ;; status) rc_failed 4 rc_status -v ++++++ boot.lvm ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200 @@ -12,6 +12,7 @@ # Should-Stop: $null # Default-Start: B # Default-Stop: +# Short-Description: Start LVM2 # Description: start logical volumes ### END INIT INFO ++++++ device-mapper-dmsetup-deps-export.patch ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200 @@ -1,8 +1,10 @@ -Index: LVM2.2.02.84/tools/dmsetup.c -=================================================================== ---- LVM2.2.02.84.orig/tools/dmsetup.c 2011-02-15 15:00:52.000000000 +0800 -+++ LVM2.2.02.84/tools/dmsetup.c 2011-02-15 15:00:54.000000000 +0800 -@@ -1645,6 +1645,7 @@ +--- + tools/dmsetup.c | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +--- LVM2.2.02.98.orig/tools/dmsetup.c ++++ LVM2.2.02.98/tools/dmsetup.c +@@ -1720,6 +1720,7 @@ static int _export(int argc, char **argv const char *name = NULL; const char *uuid = NULL; struct dm_info info; @@ -10,7 +12,7 @@ if (data) name = names->name; -@@ -1714,6 +1715,28 @@ +@@ -1789,6 +1790,28 @@ static int _export(int argc, char **argv printf("\n"); } ++++++ device-mapper-dmsetup-export.patch ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200 @@ -1,8 +1,34 @@ -Index: LVM2.2.02.84/tools/dmsetup.c -=================================================================== ---- LVM2.2.02.84.orig/tools/dmsetup.c 2011-02-05 06:17:55.000000000 +0800 -+++ LVM2.2.02.84/tools/dmsetup.c 2011-02-15 14:44:42.000000000 +0800 -@@ -1633,6 +1633,94 @@ +--- + man/dmsetup.8.in | 7 ++++ + tools/dmsetup.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 96 insertions(+) + +--- LVM2.2.02.98.orig/man/dmsetup.8.in ++++ LVM2.2.02.98/man/dmsetup.8.in +@@ -19,6 +19,9 @@ dmsetup \- low level logical volume mana + .RI [ \+ ]< sectors >| auto | none ] + .RE + .br ++.B dmsetup export ++.I [device_name] ++.br + .B dmsetup deps + .RB [ \-o + .IR options ] +@@ -285,6 +288,10 @@ device_name in subsequent dmsetup comman + If successful a device will appear as + /dev/mapper/<device-name>. + See below for information on the table format. ++.IP \fBexport ++.I [device_name] ++.br ++Outputs information in key/value format to be imported by other programs. + .br + .TP + .B deps +--- LVM2.2.02.98.orig/tools/dmsetup.c ++++ LVM2.2.02.98/tools/dmsetup.c +@@ -1708,6 +1708,94 @@ static int _status(CMD_ARGS) return r; } @@ -95,38 +121,13 @@ +} + /* Show target names and their version numbers */ - static int _targets(int argc __attribute__((unused)), char **argv __attribute__((unused)), void *data __attribute__((unused))) + static int _targets(CMD_ARGS) { -@@ -2735,6 +2823,7 @@ - {"info", "[<device>]", 0, 1, _info}, - {"deps", "[<device>]", 0, 1, _deps}, - {"status", "[<device>] [--target <target_type>]", 0, 1, _status}, -+ {"export", "[<device>]", 0, 1, _export}, - {"table", "[<device>] [--target <target_type>] [--showkeys]", 0, 1, _status}, - {"wait", "<device> [<event_nr>]", 0, 2, _wait}, - {"mknodes", "[<device>]", 0, 1, _mknodes}, -Index: LVM2.2.02.84/man/dmsetup.8.in -=================================================================== ---- LVM2.2.02.84.orig/man/dmsetup.8.in 2011-02-05 03:33:54.000000000 +0800 -+++ LVM2.2.02.84/man/dmsetup.8.in 2011-02-15 14:44:42.000000000 +0800 -@@ -50,6 +50,9 @@ - .I [--noheadings] [--separator separator] [-o fields] [-O|--sort sort_fields] - .I [device_name] - .br -+.B dmsetup export -+.I [device_name] -+.br - .B dmsetup deps - .I [device_name] - .br -@@ -200,6 +203,10 @@ - If successful a device will appear as - /dev/device-mapper/<device-name>. - See below for information on the table format. -+.IP \fBexport -+.I [device_name] -+.br -+Outputs information in key/value format to be imported by other programs. - .IP \fBdeps - .I [device_name] - .br +@@ -3058,6 +3146,7 @@ static struct command _commands[] = { + {"info", "[<device>]", 0, -1, 1, _info}, + {"deps", "[-o options] [<device>]", 0, -1, 1, _deps}, + {"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, _status}, ++ {"export", "[<device>]", 0, 1, 1, _export}, + {"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, _status}, + {"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, _wait}, + {"mknodes", "[<device>]", 0, -1, 1, _mknodes}, ++++++ device-mapper-type_punning.diff ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200 @@ -1,8 +1,10 @@ -Index: lib/device/device.c -=================================================================== ---- lib/device/device.c.orig 2009-08-02 01:14:52.000000000 +0800 -+++ lib/device/device.c 2010-02-04 14:02:42.000000000 +0800 -@@ -38,7 +38,7 @@ +--- + lib/device/device.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- LVM2.2.02.98.orig/lib/device/device.c ++++ LVM2.2.02.98/lib/device/device.c +@@ -39,7 +39,7 @@ struct partition { uint8_t end_cyl; uint32_t start_sect; uint32_t nr_sects; ++++++ dont_ignore_tmp_device_file.diff ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200 @@ -1,8 +1,10 @@ -Index: LVM2.2.02.58/lib/device/dev-cache.c -=================================================================== ---- LVM2.2.02.58.orig/lib/device/dev-cache.c 2009-07-16 04:02:46.000000000 +0800 -+++ LVM2.2.02.58/lib/device/dev-cache.c 2010-02-04 15:32:59.000000000 +0800 -@@ -358,7 +358,11 @@ +--- + lib/device/dev-cache.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- LVM2.2.02.98.orig/lib/device/dev-cache.c ++++ LVM2.2.02.98/lib/device/dev-cache.c +@@ -434,7 +434,11 @@ static int _insert_dir(const char *dir) dirent_count = scandir(dir, &dirent, NULL, alphasort); if (dirent_count > 0) { for (n = 0; n < dirent_count; n++) { ++++++ handle_extended_devt.diff ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200 @@ -1,14 +1,16 @@ -Index: LVM2.2.02.45/lib/filters/filter.c -=================================================================== ---- LVM2.2.02.45.orig/lib/filters/filter.c -+++ LVM2.2.02.45/lib/filters/filter.c -@@ -179,6 +179,10 @@ static int _scan_proc_dev(const char *pr +--- + lib/filters/filter.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- LVM2.2.02.98.orig/lib/filters/filter.c ++++ LVM2.2.02.98/lib/filters/filter.c +@@ -180,6 +180,10 @@ static int _scan_proc_dev(const char *pr /* All types unrecognised initially */ - memset(_max_partitions_by_major, 0, sizeof(int) * NUMBER_OF_MAJORS); + memset(_partitions, 0, sizeof(_partitions)); + /* Extended devt will use MAJOR 259 + Consider it an non-partitionable block device */ -+ _max_partitions_by_major[259] = 1; ++ _partitions[259].max_partitions = 1; + if (dm_snprintf(proc_devices, sizeof(proc_devices), "%s/devices", proc) < 0) { ++++++ improve_probing.diff ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200 @@ -1,7 +1,9 @@ -Index: lib/filters/filter.c -=================================================================== ---- lib/filters/filter.c.orig 2011-01-27 08:21:37.000000000 +0800 -+++ lib/filters/filter.c 2011-02-15 14:56:43.000000000 +0800 +--- + lib/filters/filter.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +--- LVM2.2.02.98.orig/lib/filters/filter.c ++++ LVM2.2.02.98/lib/filters/filter.c @@ -13,6 +13,12 @@ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -15,16 +17,16 @@ #include "lib.h" #include "dev-cache.h" #include "filter.h" -@@ -147,11 +153,18 @@ +@@ -111,11 +117,18 @@ static int _passes_lvm_type_device_filte } /* Check it's accessible */ -- if (!dev_open_flags(dev, O_RDONLY, 1, 1)) { +- if (!dev_open_readonly_quiet(dev)) { + if (!dev_open_flags(dev, O_RDONLY|O_NONBLOCK, 1, 1)) { log_debug("%s: Skipping: open failed", name); return 0; } - + + /* Skip cdrom device */ + #define CDROM_GET_CAPABILITY 0x5331 + if (ioctl(dev->fd, CDROM_GET_CAPABILITY) >= 0) { ++++++ man_page_sectors.diff ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200 @@ -1,8 +1,10 @@ -Index: man/pvdisplay.8.in -=================================================================== ---- man/pvdisplay.8.in.orig 2009-10-26 22:37:09.000000000 +0800 -+++ man/pvdisplay.8.in 2010-02-04 11:00:40.000000000 +0800 -@@ -51,7 +51,7 @@ +--- + man/pvdisplay.8.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- LVM2.2.02.98.orig/man/pvdisplay.8.in ++++ LVM2.2.02.98/man/pvdisplay.8.in +@@ -64,7 +64,7 @@ The values are: * physical volume device name * volume group name ++++++ pipe_buff-definition.diff ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200 @@ -1,8 +1,10 @@ -Index: daemons/clvmd/clvmd.c -=================================================================== ---- daemons/clvmd/clvmd.c.orig -+++ daemons/clvmd/clvmd.c -@@ -65,6 +65,8 @@ +--- + daemons/clvmd/clvmd.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- LVM2.2.02.98.orig/daemons/clvmd/clvmd.c ++++ LVM2.2.02.98/daemons/clvmd/clvmd.c +@@ -53,6 +53,8 @@ #define ISLOCAL_CSID(c) (memcmp(c, our_csid, max_csid_len) == 0) ++++++ sleep-try-open-count.diff ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200 @@ -1,9 +1,19 @@ -Index: LVM2.2.02.67/libdm/libdm-deptree.c -=================================================================== ---- LVM2.2.02.67.orig/libdm/libdm-deptree.c -+++ LVM2.2.02.67/libdm/libdm-deptree.c -@@ -1143,6 +1143,19 @@ static int _dm_tree_deactivate_children( - (child->presuspend_node && +--- + libdm/libdm-deptree.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +--- LVM2.2.02.98.orig/libdm/libdm-deptree.c ++++ LVM2.2.02.98/libdm/libdm-deptree.c +@@ -20,6 +20,7 @@ + #include <stdarg.h> + #include <sys/param.h> + #include <sys/utsname.h> ++#include <time.h> + + #define MAX_TARGET_PARAMSIZE 500000 + +@@ -1570,6 +1571,19 @@ static int _dm_tree_deactivate_children( + if ((child->presuspend_node && !_node_has_closed_parents(child->presuspend_node, uuid_prefix, uuid_prefix_len))) { + @@ -11,7 +21,7 @@ + while (info.open_count && idx--) { + struct timespec ts = {0, 500000000}; + nanosleep(&ts, NULL); -+ _info_by_dev(dinfo->major, dinfo->minor, 1, &info); ++ _info_by_dev(dinfo->major, dinfo->minor, 1, &info, NULL, NULL, NULL); + } + + if (info.open_count) { ++++++ support-drbd-filter.diff ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200 @@ -1,10 +1,13 @@ This is still very primitive support of drbd in lvm2. Can we use some /sys information for this ? -Index: LVM2.2.02.58/lib/cache/lvmcache.c -================================================================================ ---- LVM2.2.02.58/lib/cache/lvmcache.c -+++ LVM2.2.02.58/lib/cache/lvmcache.c -@@ -1222,6 +1222,14 @@ +--- + lib/cache/lvmcache.c | 14 ++++++++++++++ + lib/filters/filter.c | 7 +++++++ + 2 files changed, 21 insertions(+) + +--- LVM2.2.02.98.orig/lib/cache/lvmcache.c ++++ LVM2.2.02.98/lib/cache/lvmcache.c +@@ -1489,6 +1489,14 @@ struct lvmcache_info *lvmcache_add(struc dev_subsystem_name(existing->dev), dev_name(existing->dev)); return NULL; @@ -19,7 +22,7 @@ } else if (dm_is_dm_major(MAJOR(existing->dev->dev)) && !dm_is_dm_major(MAJOR(dev->dev))) { log_very_verbose("Ignoring duplicate PV %s on " -@@ -1242,6 +1250,12 @@ +@@ -1509,6 +1517,12 @@ struct lvmcache_info *lvmcache_add(struc "using dm %s", pvid, dev_name(existing->dev), dev_name(dev)); @@ -32,9 +35,9 @@ /* FIXME If both dm, check dependencies */ //else if (dm_is_dm_major(MAJOR(existing->dev->dev)) && //dm_is_dm_major(MAJOR(dev->dev))) ---- LVM2.2.02.58/lib/filters/filter.c -+++ LVM2.2.02.58/lib/filters/filter.c -@@ -54,6 +54,13 @@ +--- LVM2.2.02.98.orig/lib/filters/filter.c ++++ LVM2.2.02.98/lib/filters/filter.c +@@ -60,6 +60,13 @@ int md_major(void) return _md_major; } ++++++ udev-rules_update.diff ++++++ --- /var/tmp/diff_new_pack.o8a9dq/_old 2012-10-23 19:40:40.000000000 +0200 +++ /var/tmp/diff_new_pack.o8a9dq/_new 2012-10-23 19:40:40.000000000 +0200 @@ -1,10 +1,13 @@ -Index: LVM2.2.02.84/udev/10-dm.rules.in -=================================================================== ---- LVM2.2.02.84.orig/udev/10-dm.rules.in 2011-01-28 19:41:52.000000000 +0800 -+++ LVM2.2.02.84/udev/10-dm.rules.in 2011-02-15 14:50:19.000000000 +0800 -@@ -94,6 +94,10 @@ - TEST!="dm", IMPORT{program}="$env{DM_SBIN_PATH}/dmsetup info -j %M -m %m -c --nameprefixes --noheadings --rows -o name,uuid,suspended" - ENV{DM_SUSPENDED}!="?*", IMPORT{program}="$env{DM_SBIN_PATH}/dmsetup info -j %M -m %m -c --nameprefixes --noheadings --rows -o suspended" +--- + udev/10-dm.rules.in | 4 ++++ + udev/13-dm-disk.rules.in | 9 ++++++--- + 2 files changed, 10 insertions(+), 3 deletions(-) + +--- LVM2.2.02.98.orig/udev/10-dm.rules.in ++++ LVM2.2.02.98/udev/10-dm.rules.in +@@ -90,6 +90,10 @@ TEST=="dm", ENV{DM_NAME}="$attr{dm/name} + TEST!="dm", IMPORT{program}="(DM_EXEC)/dmsetup info -j %M -m %m -c --nameprefixes --noheadings --rows -o name,uuid,suspended" + ENV{DM_SUSPENDED}!="?*", IMPORT{program}="(DM_EXEC)/dmsetup info -j %M -m %m -c --nameprefixes --noheadings --rows -o suspended" +# dmsetup export is a SUSE extension to dmsetup +# it is required by some other udev rules in SUSE distro. @@ -13,11 +16,9 @@ # dmsetup tool provides suspended state information in textual # form with values "Suspended"/"Active". We translate it to # 0/1 respectively to be consistent with sysfs values. -Index: LVM2.2.02.84/udev/13-dm-disk.rules -=================================================================== ---- LVM2.2.02.84.orig/udev/13-dm-disk.rules 2009-11-13 20:33:27.000000000 +0800 -+++ LVM2.2.02.84/udev/13-dm-disk.rules 2011-02-15 14:51:31.000000000 +0800 -@@ -14,13 +14,16 @@ +--- LVM2.2.02.98.orig/udev/13-dm-disk.rules.in ++++ LVM2.2.02.98/udev/13-dm-disk.rules.in +@@ -14,13 +14,16 @@ ACTION!="add|change", GOTO="dm_end" ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_end" ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}=="1", GOTO="dm_end" @@ -29,7 +30,7 @@ ENV{DM_SUSPENDED}=="1", GOTO="dm_end" +ENV{DM_TARGET_TYPES}=="|*error*", GOTO="dm_end" - IMPORT{program}="$env{DM_SBIN_PATH}/blkid -o udev -p $tempnode" + (BLKID_RULE) -ENV{DM_UDEV_LOW_PRIORITY_FLAG}=="1", OPTIONS="link_priority=-100" +ENV{DM_UDEV_LOW_PRIORITY_FLAG}=="1", OPTIONS+="link_priority=-100" +OPTIONS+="watch" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
