[arch-commits] Commit in lvm2/trunk (2 files)
Date: Saturday, October 7, 2017 @ 10:45:10 Author: eworm Revision: 307112 upgpkg: lvm2 2.02.175-1 new upstream release Modified: lvm2/trunk/PKGBUILD Deleted: lvm2/trunk/0002-toollib_fix_parentheses_in_assignment_comparison.patch -+ 0002-toollib_fix_parentheses_in_assignment_comparison.patch | 19 -- PKGBUILD| 15 ++- 2 files changed, 5 insertions(+), 29 deletions(-) Deleted: 0002-toollib_fix_parentheses_in_assignment_comparison.patch === --- 0002-toollib_fix_parentheses_in_assignment_comparison.patch 2017-10-07 10:03:42 UTC (rev 307111) +++ 0002-toollib_fix_parentheses_in_assignment_comparison.patch 2017-10-07 10:45:10 UTC (rev 307112) @@ -1,19 +0,0 @@ -commit 5407327bc6fff77dabb6dd55150832373ba163a7 -Author: David Teigland-Date: Tue Sep 19 09:19:24 2017 -0500 - -toollib: fix parentheses in assignment + comparison - -diff --git a/tools/toollib.c b/tools/toollib.c -index 1799bc91c..bf3e9d643 100644 a/tools/toollib.c -+++ b/tools/toollib.c -@@ -4464,7 +4464,7 @@ int process_each_pv(struct cmd_context *cmd, -* from all VGs are processed first, removing them from all_devices. Then -* any devs remaining in all_devices are processed. -*/ -- if ((ret = _get_all_devices(cmd, _devices) != ECMD_PROCESSED)) { -+ if ((ret = _get_all_devices(cmd, _devices)) != ECMD_PROCESSED) { - ret_max = ret; - goto_out; - } Modified: PKGBUILD === --- PKGBUILD2017-10-07 10:03:42 UTC (rev 307111) +++ PKGBUILD2017-10-07 10:45:10 UTC (rev 307112) @@ -4,8 +4,8 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.174 -pkgrel=2 +pkgver=2.02.175 +pkgrel=1 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/; license=('GPL2' 'LGPL2.1') @@ -17,16 +17,14 @@ lvm2_hook sd-lvm2_install 11-dm-initramfs.rules -0001-lvm2-make-sockets-static.patch -0002-toollib_fix_parentheses_in_assignment_comparison.patch) -sha256sums=('fb6ecec0408cb14ac4923c87cb0a356481122d7d0ae3fee6e94d2edb9d170a8b' +0001-lvm2-make-sockets-static.patch) +sha256sums=('4db7a3ec6d082be212f759279b54bcdfd3c3797a5ea67605746049b004632559' 'SKIP' 'd3097296bdfd9912dbef6ac78b908f7017b0a668a5347f0811f1c3aaacdca0cf' '97d7c92e4954bc0108e7cd183b2eb5fe7ecc97e6f56369669e6537cb6ed45d80' 'ca25d7d827823ed88c5ed662d561ad9de0123ca6e8e5b568fe9eec3c89918614' 'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0' -'ff2c21d8f1c01c5e889a61109a152dcbd15da017bb942cf598c82e2e18ad22fa' -'9883be237acb9fc49f229621d0c025fd9c29a4d0f43bfbe87ab6eb76bf389338') +'ff2c21d8f1c01c5e889a61109a152dcbd15da017bb942cf598c82e2e18ad22fa') prepare() { cd LVM2.${pkgver} @@ -36,9 +34,6 @@ # make systemd sockets static patch -p1 -i "${srcdir}/0001-lvm2-make-sockets-static.patch" - - # toollib: fix parentheses in assignment + comparison - patch -p1 -i "${srcdir}/0002-toollib_fix_parentheses_in_assignment_comparison.patch" } build() {
[arch-commits] Commit in lvm2/trunk (2 files)
Date: Thursday, June 16, 2016 @ 11:14:16 Author: eworm Revision: 270009 upgpkg: lvm2 2.02.156-2 pvscan: fix lvmlockd global lock (fix FS#49530 ?) Added: lvm2/trunk/02-pvscan-fix-lvmlockd-global-lock.patch Modified: lvm2/trunk/PKGBUILD --+ 02-pvscan-fix-lvmlockd-global-lock.patch | 27 +++ PKGBUILD | 11 --- 2 files changed, 35 insertions(+), 3 deletions(-) Added: 02-pvscan-fix-lvmlockd-global-lock.patch === --- 02-pvscan-fix-lvmlockd-global-lock.patch(rev 0) +++ 02-pvscan-fix-lvmlockd-global-lock.patch2016-06-16 11:14:16 UTC (rev 270009) @@ -0,0 +1,27 @@ +From 944ae4d2df0f15afb29ac0a68d0dd012d9df9acf Mon Sep 17 00:00:00 2001 +From: David Teigland+Date: Wed, 15 Jun 2016 16:51:36 -0500 +Subject: pvscan: fix lvmlockd global lock + +This should have been removed when pvscan was +recently converted to use process_each_pv which +does the lvmlockd locking. +--- + tools/pvscan.c | 4 + 1 file changed, 4 deletions(-) + +diff --git a/tools/pvscan.c b/tools/pvscan.c +index 5987e8b..78dad82 100644 +--- a/tools/pvscan.c b/tools/pvscan.c +@@ -624,10 +624,6 @@ int pvscan(struct cmd_context *cmd, int argc, char **argv) + return ECMD_FAILED; + } + +- /* Needed for a current listing of the global VG namespace. */ +- if (!lockd_gl(cmd, "sh", 0)) +- return_ECMD_FAILED; +- + if (!(handle = init_processing_handle(cmd))) { + log_error("Failed to initialize processing handle."); + ret = ECMD_FAILED; Modified: PKGBUILD === --- PKGBUILD2016-06-16 10:36:28 UTC (rev 270008) +++ PKGBUILD2016-06-16 11:14:16 UTC (rev 270009) @@ -5,7 +5,7 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.156 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/; license=('GPL2' 'LGPL2.1') @@ -16,7 +16,8 @@ lvm2_hook sd-lvm2_install 11-dm-initramfs.rules -01-lvm2-make-sockets-static.patch) +01-lvm2-make-sockets-static.patch +02-pvscan-fix-lvmlockd-global-lock.patch) sha1sums=('35756b700c33e5a19a864656493aace33da79661' 'SKIP' '056bb0227d07e35a3d365db02f439585314cfc76' @@ -23,7 +24,8 @@ 'ff0fdf0a3005a41acd4b36865056109effc3474b' 'f6ac78163ab3aba5b51a71655d6e53d05014bfa4' 'f6a554eea9557c3c236df2943bb6e7e723945c41' - 'b084512af42f2e16cdccd8b7ee4de27b574d1f94') + 'b084512af42f2e16cdccd8b7ee4de27b574d1f94' + 'df8b2110203464f2bb55fb728cdd07e6d71f1a10') validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17') prepare() { @@ -34,6 +36,9 @@ # make systemd sockets static patch -p1 -i "${srcdir}/01-lvm2-make-sockets-static.patch" + + # pvscan: fix lvmlockd global lock + patch -p1 -i "${srcdir}/02-pvscan-fix-lvmlockd-global-lock.patch" } build() {
[arch-commits] Commit in lvm2/trunk (2 files)
Date: Sunday, November 29, 2015 @ 11:15:46 Author: bpiotrowski Revision: 252040 upgpkg: lvm2 2.02.136-1 new upstream release Modified: lvm2/trunk/PKGBUILD Deleted: lvm2/trunk/lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch ---+ PKGBUILD | 15 - lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch | 116 -- 2 files changed, 5 insertions(+), 126 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-11-29 10:14:14 UTC (rev 252039) +++ PKGBUILD2015-11-29 10:15:46 UTC (rev 252040) @@ -4,8 +4,8 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.134 -pkgrel=2 +pkgver=2.02.136 +pkgrel=1 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/; license=('GPL2' 'LGPL2.1') @@ -16,16 +16,14 @@ lvm2_hook sd-lvm2_install 11-dm-initramfs.rules -lvm2-make-sockets-static.patch - lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch) -sha1sums=('4180405b7847515a08def649d3140b5d8bd0e258' +lvm2-make-sockets-static.patch) +sha1sums=('4a33ad0451be5830f554b1e8de8dac698fb23356' 'SKIP' '40ef991650555b904e73bcc3f344d736722e27ca' 'ff0fdf0a3005a41acd4b36865056109effc3474b' '86c18852409dc03f38bdd734ac3e7b54bed9c4ce' 'f6a554eea9557c3c236df2943bb6e7e723945c41' - 'b084512af42f2e16cdccd8b7ee4de27b574d1f94' - '19c61c9c240cbef44833a1112305f6f7450e8140') + 'b084512af42f2e16cdccd8b7ee4de27b574d1f94') validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17') prepare() { @@ -36,9 +34,6 @@ # make systemd sockets static patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch" - - # lvm2 fails to detect cache metadata if cache policy is missing - patch -p1 -i "${srcdir}"/lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch } build() { Deleted: lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch === --- lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch 2015-11-29 10:14:14 UTC (rev 252039) +++ lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch 2015-11-29 10:15:46 UTC (rev 252040) @@ -1,116 +0,0 @@ -commit 265a99e98a81113c2f27f0e4d6c5b73d198ed586 -Author: Peter Rajnoha-Date: Tue Nov 24 11:28:31 2015 +0100 - -Fix reading of old cache metadata. - lib/cache_segtype/cache.c| 34 + - test/shell/lvchange-cache-old.sh | 41 - 2 files changed, 75 insertions(+) - -diff --git a/lib/cache_segtype/cache.c b/lib/cache_segtype/cache.c -index 85cba18..2a7eb96 100644 a/lib/cache_segtype/cache.c -+++ b/lib/cache_segtype/cache.c -@@ -34,6 +34,32 @@ static unsigned _feature_mask; - log_error(t " segment %s of logical volume %s.", ## p,\ - dm_config_parent_name(sn), seg->lv->name), 0; - -+/* -+ * When older metadata are loaded without newer settings, -+ * set then to default settings (the one that could have been -+ * used implicitely at that time). -+ * -+ * Needs both segments cache and cache_pool to be loaded. -+ */ -+static int _fix_missing_defaults(struct lv_segment *cpool_seg) -+{ -+ if (!cpool_seg->policy_name) { -+ cpool_seg->policy_name = "mq"; -+ log_verbose("Cache is missing cache policy, using %s.", -+ cpool_seg->policy_name); -+ } -+ -+ if (!cache_mode_is_set(cpool_seg)) { -+ if (!cache_set_mode(cpool_seg, "writethrough")) { -+ log_error(INTERNAL_ERROR "Failed to writethrough cache mode."); -+ return 0; -+ } -+ log_verbose("Cache is missing cache mode, using %s.", -+ get_cache_mode_name(cpool_seg)); -+ } -+ -+ return 1; -+} - - static int _cache_pool_text_import(struct lv_segment *seg, - const struct dm_config_node *sn, -@@ -115,6 +141,10 @@ static int _cache_pool_text_import(struct lv_segment *seg, - if (!attach_pool_metadata_lv(seg, meta_lv)) - return_0; - -+ if (!dm_list_empty(>lv->segs_using_this_lv) && -+ !_fix_missing_defaults(seg)) -+ return_0; -+ - return 1; - } - -@@ -319,6 +349,10 @@ static int _cache_text_import(struct lv_segment *seg, - if (!attach_pool_lv(seg, pool_lv, NULL, NULL)) - return_0; - -+ if (!dm_list_empty(_lv->segments) && -+ !_fix_missing_defaults(first_seg(pool_lv))) -+
[arch-commits] Commit in lvm2/trunk (2 files)
Date: Saturday, November 28, 2015 @ 20:28:45 Author: bpiotrowski Revision: 252031 upgpkg: lvm2 2.02.134-2 backport patch that fixes lvm2 failing to find cache metadata if cache policy is missing (FS#47196) Added: lvm2/trunk/lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch Modified: lvm2/trunk/PKGBUILD ---+ PKGBUILD | 11 lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch | 116 ++ 2 files changed, 124 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-11-28 19:12:32 UTC (rev 252030) +++ PKGBUILD2015-11-28 19:28:45 UTC (rev 252031) @@ -5,7 +5,7 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.134 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/; license=('GPL2' 'LGPL2.1') @@ -16,7 +16,8 @@ lvm2_hook sd-lvm2_install 11-dm-initramfs.rules -lvm2-make-sockets-static.patch) +lvm2-make-sockets-static.patch + lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch) sha1sums=('4180405b7847515a08def649d3140b5d8bd0e258' 'SKIP' '40ef991650555b904e73bcc3f344d736722e27ca' @@ -23,7 +24,8 @@ 'ff0fdf0a3005a41acd4b36865056109effc3474b' '86c18852409dc03f38bdd734ac3e7b54bed9c4ce' 'f6a554eea9557c3c236df2943bb6e7e723945c41' - 'b084512af42f2e16cdccd8b7ee4de27b574d1f94') + 'b084512af42f2e16cdccd8b7ee4de27b574d1f94' + '19c61c9c240cbef44833a1112305f6f7450e8140') validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17') prepare() { @@ -34,6 +36,9 @@ # make systemd sockets static patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch" + + # lvm2 fails to detect cache metadata if cache policy is missing + patch -p1 -i "${srcdir}"/lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch } build() { Added: lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch === --- lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch (rev 0) +++ lvm2-2.02.135-fix-reading-of-old-metadata-with-missing-cache-policy-or-mode.patch 2015-11-28 19:28:45 UTC (rev 252031) @@ -0,0 +1,116 @@ +commit 265a99e98a81113c2f27f0e4d6c5b73d198ed586 +Author: Peter Rajnoha+Date: Tue Nov 24 11:28:31 2015 +0100 + +Fix reading of old cache metadata. +--- + lib/cache_segtype/cache.c| 34 + + test/shell/lvchange-cache-old.sh | 41 + 2 files changed, 75 insertions(+) + +diff --git a/lib/cache_segtype/cache.c b/lib/cache_segtype/cache.c +index 85cba18..2a7eb96 100644 +--- a/lib/cache_segtype/cache.c b/lib/cache_segtype/cache.c +@@ -34,6 +34,32 @@ static unsigned _feature_mask; + log_error(t " segment %s of logical volume %s.", ## p,\ + dm_config_parent_name(sn), seg->lv->name), 0; + ++/* ++ * When older metadata are loaded without newer settings, ++ * set then to default settings (the one that could have been ++ * used implicitely at that time). ++ * ++ * Needs both segments cache and cache_pool to be loaded. ++ */ ++static int _fix_missing_defaults(struct lv_segment *cpool_seg) ++{ ++ if (!cpool_seg->policy_name) { ++ cpool_seg->policy_name = "mq"; ++ log_verbose("Cache is missing cache policy, using %s.", ++ cpool_seg->policy_name); ++ } ++ ++ if (!cache_mode_is_set(cpool_seg)) { ++ if (!cache_set_mode(cpool_seg, "writethrough")) { ++ log_error(INTERNAL_ERROR "Failed to writethrough cache mode."); ++ return 0; ++ } ++ log_verbose("Cache is missing cache mode, using %s.", ++ get_cache_mode_name(cpool_seg)); ++ } ++ ++ return 1; ++} + + static int _cache_pool_text_import(struct lv_segment *seg, + const struct dm_config_node *sn, +@@ -115,6 +141,10 @@ static int _cache_pool_text_import(struct lv_segment *seg, + if (!attach_pool_metadata_lv(seg, meta_lv)) + return_0; + ++ if (!dm_list_empty(>lv->segs_using_this_lv) && ++ !_fix_missing_defaults(seg)) ++ return_0; ++ + return 1; + } + +@@ -319,6 +349,10 @@ static int _cache_text_import(struct lv_segment *seg, + if (!attach_pool_lv(seg, pool_lv, NULL, NULL)) + return_0; + ++ if (!dm_list_empty(_lv->segments) && ++ !_fix_missing_defaults(first_seg(pool_lv)))
[arch-commits] Commit in lvm2/trunk (2 files)
Date: Wednesday, September 23, 2015 @ 23:37:45 Author: bpiotrowski Revision: 247181 upgpkg: lvm2 2.02.132-1 new upstream release Modified: lvm2/trunk/PKGBUILD Deleted: lvm2/trunk/0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch --+ 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch | 28 - PKGBUILD | 12 +++-- 2 files changed, 4 insertions(+), 36 deletions(-) Deleted: 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch === --- 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch2015-09-23 21:32:46 UTC (rev 247180) +++ 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch2015-09-23 21:37:45 UTC (rev 247181) @@ -1,28 +0,0 @@ -From 3ea396e9d220cec55fd4e139be7ae486cb4ddb91 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?=-Date: Wed, 12 Aug 2015 09:29:04 +0200 -Subject: [PATCH] udev: use += for SYSTEMD_WANTS instead of = - -Instead of using = to override SYSTEMD_WANTS, use += to add -the pvscan service. - WHATS_NEW| 1 + - udev/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/udev/Makefile.in b/udev/Makefile.in -index 390069b..c4cc2bd 100644 a/udev/Makefile.in -+++ b/udev/Makefile.in -@@ -47,7 +47,7 @@ BLKID_RULE=IMPORT{program}=\"${SBIN}\/blkid -o udev -p \$$tempnode\" - endif - - ifeq ("@UDEV_SYSTEMD_BACKGROUND_JOBS@", "yes") --PVSCAN_RULE=ACTION\!=\"remove\", ENV{LVM_PV_GONE}==\"1\", RUN\+=\"@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\", GOTO=\"lvm_end\"\nENV{SYSTEMD_ALIAS}=\"\/dev\/block\/\$$major:\$$minor\"\nENV{ID_MODEL}=\"LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\"\nENV{SYSTEMD_WANTS}=\"lvm2-pvscan@\$$major:\$$minor.service\" -+PVSCAN_RULE=ACTION\!=\"remove\", ENV{LVM_PV_GONE}==\"1\", RUN\+=\"@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\", GOTO=\"lvm_end\"\nENV{SYSTEMD_ALIAS}=\"\/dev\/block\/\$$major:\$$minor\"\nENV{ID_MODEL}=\"LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\"\nENV{SYSTEMD_WANTS}\+=\"lvm2-pvscan@\$$major:\$$minor.service\" - else - PVSCAN_RULE=RUN\+\=\"$(LVM_EXEC)/lvm pvscan --background --cache --activate ay --major \$$major --minor \$$minor\", ENV{LVM_SCANNED}=\"1\" - endif --- -2.5.0 - Modified: PKGBUILD === --- PKGBUILD2015-09-23 21:32:46 UTC (rev 247180) +++ PKGBUILD2015-09-23 21:37:45 UTC (rev 247181) @@ -4,7 +4,7 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.127 +pkgver=2.02.132 pkgrel=1 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/; @@ -16,16 +16,14 @@ lvm2_hook sd-lvm2_install 11-dm-initramfs.rules -lvm2-make-sockets-static.patch -0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch) -sha1sums=('e6a4184be7c2a22725e647de131663637023e895' +lvm2-make-sockets-static.patch) +sha1sums=('45a486e2aba07fa50fd663d0c550ba9a136aead2' 'SKIP' '40ef991650555b904e73bcc3f344d736722e27ca' 'ff0fdf0a3005a41acd4b36865056109effc3474b' '86c18852409dc03f38bdd734ac3e7b54bed9c4ce' 'f6a554eea9557c3c236df2943bb6e7e723945c41' - 'b084512af42f2e16cdccd8b7ee4de27b574d1f94' - '8cbab7e869f0f0949ae9a3104cafb76b77de52c4') + 'b084512af42f2e16cdccd8b7ee4de27b574d1f94') validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17') prepare() { @@ -36,8 +34,6 @@ # make systemd sockets static patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch" - # fix udev rules - patch -p1 -i "${srcdir}/0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch" } build() {
[arch-commits] Commit in lvm2/trunk (2 files)
Date: Thursday, August 13, 2015 @ 14:36:54 Author: thomas Revision: 243408 upgpkg: lvm2 2.02.127-1 Added: lvm2/trunk/0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch Modified: lvm2/trunk/PKGBUILD --+ 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch | 28 + PKGBUILD | 12 ++--- 2 files changed, 36 insertions(+), 4 deletions(-) Added: 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch === --- 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch (rev 0) +++ 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch2015-08-13 12:36:54 UTC (rev 243408) @@ -0,0 +1,28 @@ +From 3ea396e9d220cec55fd4e139be7ae486cb4ddb91 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= tho...@archlinux.org +Date: Wed, 12 Aug 2015 09:29:04 +0200 +Subject: [PATCH] udev: use += for SYSTEMD_WANTS instead of = + +Instead of using = to override SYSTEMD_WANTS, use += to add +the pvscan service. +--- + WHATS_NEW| 1 + + udev/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/udev/Makefile.in b/udev/Makefile.in +index 390069b..c4cc2bd 100644 +--- a/udev/Makefile.in b/udev/Makefile.in +@@ -47,7 +47,7 @@ BLKID_RULE=IMPORT{program}=\${SBIN}\/blkid -o udev -p \$$tempnode\ + endif + + ifeq (@UDEV_SYSTEMD_BACKGROUND_JOBS@, yes) +-PVSCAN_RULE=ACTION\!=\remove\, ENV{LVM_PV_GONE}==\1\, RUN\+=\@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\, GOTO=\lvm_end\\nENV{SYSTEMD_ALIAS}=\\/dev\/block\/\$$major:\$$minor\\nENV{ID_MODEL}=\LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\\nENV{SYSTEMD_WANTS}=\lvm2-pvscan@\$$major:\$$minor.service\ ++PVSCAN_RULE=ACTION\!=\remove\, ENV{LVM_PV_GONE}==\1\, RUN\+=\@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\, GOTO=\lvm_end\\nENV{SYSTEMD_ALIAS}=\\/dev\/block\/\$$major:\$$minor\\nENV{ID_MODEL}=\LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\\nENV{SYSTEMD_WANTS}\+=\lvm2-pvscan@\$$major:\$$minor.service\ + else + PVSCAN_RULE=RUN\+\=\$(LVM_EXEC)/lvm pvscan --background --cache --activate ay --major \$$major --minor \$$minor\, ENV{LVM_SCANNED}=\1\ + endif +-- +2.5.0 + Modified: PKGBUILD === --- PKGBUILD2015-08-13 12:25:59 UTC (rev 243407) +++ PKGBUILD2015-08-13 12:36:54 UTC (rev 243408) @@ -4,7 +4,7 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.125 +pkgver=2.02.127 pkgrel=1 arch=('i686' 'x86_64') url=http://sourceware.org/lvm2/; @@ -16,14 +16,16 @@ lvm2_hook sd-lvm2_install 11-dm-initramfs.rules -lvm2-make-sockets-static.patch) -sha1sums=('a45bbdcbbcf6a8b4aa9c62f16bc029f687a2daa4' +lvm2-make-sockets-static.patch +0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch) +sha1sums=('e6a4184be7c2a22725e647de131663637023e895' 'SKIP' '40ef991650555b904e73bcc3f344d736722e27ca' 'ff0fdf0a3005a41acd4b36865056109effc3474b' '86c18852409dc03f38bdd734ac3e7b54bed9c4ce' 'f6a554eea9557c3c236df2943bb6e7e723945c41' - 'b084512af42f2e16cdccd8b7ee4de27b574d1f94') + 'b084512af42f2e16cdccd8b7ee4de27b574d1f94' + '8cbab7e869f0f0949ae9a3104cafb76b77de52c4') validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17') prepare() { @@ -34,6 +36,8 @@ # make systemd sockets static patch -p1 -i ${srcdir}/lvm2-make-sockets-static.patch + # fix udev rules + patch -p1 -i ${srcdir}/0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch } build() {
[arch-commits] Commit in lvm2/trunk (2 files)
Date: Tuesday, June 16, 2015 @ 21:47:44 Author: bpiotrowski Revision: 240961 upgpkg: lvm2 2.02.121-1 new upstream release Modified: lvm2/trunk/PKGBUILD Deleted: lvm2/trunk/0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch -+ 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch | 29 -- PKGBUILD| 15 + 2 files changed, 5 insertions(+), 39 deletions(-) Deleted: 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch === --- 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch 2015-06-16 19:40:13 UTC (rev 240960) +++ 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch 2015-06-16 19:47:44 UTC (rev 240961) @@ -1,29 +0,0 @@ -From f8bf6410954fcf82bf28852e0dba015c6b7f19dc Mon Sep 17 00:00:00 2001 -From: Ondrej Kozina okoz...@redhat.com -Date: Fri, 22 May 2015 14:48:28 +0200 -Subject: [PATCH] lvmetad.c: ignore lvmetad global handle on disconnect - -do not unset lvmetad global handle on disconnect. This is -hotfix for issue described in: -https://www.redhat.com/archives/linux-lvm/2015-May/msg8.html - -Reported-by: Christian Hesse l...@eworm.de - lib/cache/lvmetad.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c -index 68162b6..73a382c 100644 a/lib/cache/lvmetad.c -+++ b/lib/cache/lvmetad.c -@@ -39,7 +39,6 @@ void lvmetad_disconnect(void) - if (_lvmetad_connected) - daemon_close(_lvmetad); - _lvmetad_connected = 0; -- _lvmetad_cmd = NULL; - } - - void lvmetad_init(struct cmd_context *cmd) --- -2.4.2 - Modified: PKGBUILD === --- PKGBUILD2015-06-16 19:40:13 UTC (rev 240960) +++ PKGBUILD2015-06-16 19:47:44 UTC (rev 240961) @@ -4,8 +4,8 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.120 -pkgrel=2 +pkgver=2.02.121 +pkgrel=1 arch=('i686' 'x86_64') url=http://sourceware.org/lvm2/; license=('GPL2' 'LGPL2.1') @@ -16,16 +16,14 @@ lvm2_hook sd-lvm2_install 11-dm-initramfs.rules -lvm2-make-sockets-static.patch -0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch) -sha1sums=('34f015ee90316c1afc72f715a468028e0f89b705' +lvm2-make-sockets-static.patch) +sha1sums=('618b94b01a719afa9ba1714f584c912658211615' 'SKIP' '40ef991650555b904e73bcc3f344d736722e27ca' 'ff0fdf0a3005a41acd4b36865056109effc3474b' '86c18852409dc03f38bdd734ac3e7b54bed9c4ce' 'f6a554eea9557c3c236df2943bb6e7e723945c41' - 'b084512af42f2e16cdccd8b7ee4de27b574d1f94' - '4506a6d149430009ecd949c9413b5cf4b28899af') + 'b084512af42f2e16cdccd8b7ee4de27b574d1f94') validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17') prepare() { @@ -36,9 +34,6 @@ # make systemd sockets static patch -p1 -i ${srcdir}/lvm2-make-sockets-static.patch - - # pvscan segfaults in initramfs - patch -p1 -i ${srcdir}/0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch } build() {
[arch-commits] Commit in lvm2/trunk (2 files)
Date: Sunday, June 7, 2015 @ 12:33:31 Author: bpiotrowski Revision: 240397 upgpkg: lvm2 2.02.120-2 Add patch fixing pvscan segfaults in the initramfs. (FS#45234) Added: lvm2/trunk/0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch Modified: lvm2/trunk/PKGBUILD -+ 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch | 29 ++ PKGBUILD| 13 +++- 2 files changed, 39 insertions(+), 3 deletions(-) Added: 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch === --- 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch (rev 0) +++ 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch 2015-06-07 10:33:31 UTC (rev 240397) @@ -0,0 +1,29 @@ +From f8bf6410954fcf82bf28852e0dba015c6b7f19dc Mon Sep 17 00:00:00 2001 +From: Ondrej Kozina okoz...@redhat.com +Date: Fri, 22 May 2015 14:48:28 +0200 +Subject: [PATCH] lvmetad.c: ignore lvmetad global handle on disconnect + +do not unset lvmetad global handle on disconnect. This is +hotfix for issue described in: +https://www.redhat.com/archives/linux-lvm/2015-May/msg8.html + +Reported-by: Christian Hesse l...@eworm.de +--- + lib/cache/lvmetad.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c +index 68162b6..73a382c 100644 +--- a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c +@@ -39,7 +39,6 @@ void lvmetad_disconnect(void) + if (_lvmetad_connected) + daemon_close(_lvmetad); + _lvmetad_connected = 0; +- _lvmetad_cmd = NULL; + } + + void lvmetad_init(struct cmd_context *cmd) +-- +2.4.2 + Modified: PKGBUILD === --- PKGBUILD2015-06-07 10:17:58 UTC (rev 240396) +++ PKGBUILD2015-06-07 10:33:31 UTC (rev 240397) @@ -5,7 +5,7 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.120 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url=http://sourceware.org/lvm2/; license=('GPL2' 'LGPL2.1') @@ -16,7 +16,8 @@ lvm2_hook sd-lvm2_install 11-dm-initramfs.rules -lvm2-make-sockets-static.patch) +lvm2-make-sockets-static.patch +0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch) sha1sums=('34f015ee90316c1afc72f715a468028e0f89b705' 'SKIP' '40ef991650555b904e73bcc3f344d736722e27ca' @@ -23,15 +24,21 @@ 'ff0fdf0a3005a41acd4b36865056109effc3474b' '86c18852409dc03f38bdd734ac3e7b54bed9c4ce' 'f6a554eea9557c3c236df2943bb6e7e723945c41' - 'b084512af42f2e16cdccd8b7ee4de27b574d1f94') + 'b084512af42f2e16cdccd8b7ee4de27b574d1f94' + '4506a6d149430009ecd949c9413b5cf4b28899af') validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17') prepare() { cd LVM2.${pkgver} + # enable lvmetad sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in + # make systemd sockets static patch -p1 -i ${srcdir}/lvm2-make-sockets-static.patch + + # pvscan segfaults in initramfs + patch -p1 -i ${srcdir}/0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch } build() {
[arch-commits] Commit in lvm2/trunk (2 files)
Date: Sunday, July 27, 2014 @ 21:31:09 Author: eric Revision: 218243 upgpkg: lvm2 2.02.108-1 Upstream update, Remove old patch Modified: lvm2/trunk/PKGBUILD Deleted: lvm2/trunk/libdm-fix-double-const-for-value-in-dm_report_reserv.patch + PKGBUILD | 14 ++--- libdm-fix-double-const-for-value-in-dm_report_reserv.patch | 27 --- 2 files changed, 5 insertions(+), 36 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-07-27 18:59:55 UTC (rev 218242) +++ PKGBUILD2014-07-27 19:31:09 UTC (rev 218243) @@ -4,8 +4,8 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.107 -pkgrel=2 +pkgver=2.02.108 +pkgrel=1 arch=('i686' 'x86_64') url=http://sourceware.org/lvm2/; license=('GPL2' 'LGPL2.1') @@ -16,16 +16,14 @@ lvm2_hook sd-lvm2 11-dm-initramfs.rules -lvm2-make-sockets-static.patch - libdm-fix-double-const-for-value-in-dm_report_reserv.patch) -sha1sums=('95e99c04ac1b5b987de41d4e31cca982caaee5f9' +lvm2-make-sockets-static.patch) +sha1sums=('fc133c93f5250ae94fbf19df03b658eb0382a632' 'SKIP' 'be3b7db02e76d31d4742dc853b2fa3f898368ff8' 'ff0fdf0a3005a41acd4b36865056109effc3474b' '86c18852409dc03f38bdd734ac3e7b54bed9c4ce' 'f6a554eea9557c3c236df2943bb6e7e723945c41' - 'b084512af42f2e16cdccd8b7ee4de27b574d1f94' - '3628a39b49162d08da87cf52a830eb2f8dff4995') + 'b084512af42f2e16cdccd8b7ee4de27b574d1f94') prepare() { cd LVM2.${pkgver} @@ -33,8 +31,6 @@ sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in # make systemd sockets static patch -p1 -i ${srcdir}/lvm2-make-sockets-static.patch - # fix virtualbox building (merged upstream) - patch -p1 -i ${srcdir}/libdm-fix-double-const-for-value-in-dm_report_reserv.patch } build() { Deleted: libdm-fix-double-const-for-value-in-dm_report_reserv.patch === --- libdm-fix-double-const-for-value-in-dm_report_reserv.patch 2014-07-27 18:59:55 UTC (rev 218242) +++ libdm-fix-double-const-for-value-in-dm_report_reserv.patch 2014-07-27 19:31:09 UTC (rev 218243) @@ -1,27 +0,0 @@ -From 100342605ce4a304b397665682d2ec555af5aa27 Mon Sep 17 00:00:00 2001 -From: Peter Rajnoha prajn...@redhat.com -Date: Mon, 30 Jun 2014 09:44:23 +0200 -Subject: [PATCH] libdm: fix double const for value in - dm_report_reserved_value structure - -C++ may have - libdm/libdevmapper.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h -index 90e0b51..ad504da 100644 a/libdm/libdevmapper.h -+++ b/libdm/libdevmapper.h -@@ -1660,7 +1660,7 @@ struct dm_report_field_type { - - struct dm_report_reserved_value { - const unsigned type;/* DM_REPORT_FIELD_TYPE_* */ -- const void const *value;/* reserved value: -+ const void *value; /* reserved value: - uint64_t for DM_REPORT_FIELD_TYPE_NUMBER - uint64_t for DM_REPORT_FIELD_TYPE_SIZE (number of 512-byte sectors) - uint64_t for DM_REPORT_FIELD_TYPE_PERCENT --- -2.0.1 -
[arch-commits] Commit in lvm2/trunk (2 files)
Date: Friday, July 18, 2014 @ 16:12:58 Author: lcarlier Revision: 217418 upgpkg: lvm2 2.02.107-2 fix virtualbox building (FS#41252) Added: lvm2/trunk/libdm-fix-double-const-for-value-in-dm_report_reserv.patch Modified: lvm2/trunk/PKGBUILD + PKGBUILD | 10 ++-- libdm-fix-double-const-for-value-in-dm_report_reserv.patch | 27 +++ 2 files changed, 34 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-07-18 13:18:28 UTC (rev 217417) +++ PKGBUILD2014-07-18 14:12:58 UTC (rev 217418) @@ -5,7 +5,7 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.107 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url=http://sourceware.org/lvm2/; license=('GPL2' 'LGPL2.1') @@ -16,7 +16,8 @@ lvm2_hook sd-lvm2 11-dm-initramfs.rules -lvm2-make-sockets-static.patch) +lvm2-make-sockets-static.patch + libdm-fix-double-const-for-value-in-dm_report_reserv.patch) sha1sums=('95e99c04ac1b5b987de41d4e31cca982caaee5f9' 'SKIP' 'be3b7db02e76d31d4742dc853b2fa3f898368ff8' @@ -23,7 +24,8 @@ 'ff0fdf0a3005a41acd4b36865056109effc3474b' '86c18852409dc03f38bdd734ac3e7b54bed9c4ce' 'f6a554eea9557c3c236df2943bb6e7e723945c41' - 'b084512af42f2e16cdccd8b7ee4de27b574d1f94') + 'b084512af42f2e16cdccd8b7ee4de27b574d1f94' + '3628a39b49162d08da87cf52a830eb2f8dff4995') prepare() { cd LVM2.${pkgver} @@ -31,6 +33,8 @@ sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in # make systemd sockets static patch -p1 -i ${srcdir}/lvm2-make-sockets-static.patch + # fix virtualbox building (merged upstream) + patch -p1 -i ${srcdir}/libdm-fix-double-const-for-value-in-dm_report_reserv.patch } build() { Added: libdm-fix-double-const-for-value-in-dm_report_reserv.patch === --- libdm-fix-double-const-for-value-in-dm_report_reserv.patch (rev 0) +++ libdm-fix-double-const-for-value-in-dm_report_reserv.patch 2014-07-18 14:12:58 UTC (rev 217418) @@ -0,0 +1,27 @@ +From 100342605ce4a304b397665682d2ec555af5aa27 Mon Sep 17 00:00:00 2001 +From: Peter Rajnoha prajn...@redhat.com +Date: Mon, 30 Jun 2014 09:44:23 +0200 +Subject: [PATCH] libdm: fix double const for value in + dm_report_reserved_value structure + +C++ may have +--- + libdm/libdevmapper.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h +index 90e0b51..ad504da 100644 +--- a/libdm/libdevmapper.h b/libdm/libdevmapper.h +@@ -1660,7 +1660,7 @@ struct dm_report_field_type { + + struct dm_report_reserved_value { + const unsigned type;/* DM_REPORT_FIELD_TYPE_* */ +- const void const *value;/* reserved value: ++ const void *value; /* reserved value: + uint64_t for DM_REPORT_FIELD_TYPE_NUMBER + uint64_t for DM_REPORT_FIELD_TYPE_SIZE (number of 512-byte sectors) + uint64_t for DM_REPORT_FIELD_TYPE_PERCENT +-- +2.0.1 +
[arch-commits] Commit in lvm2/trunk (2 files)
Date: Monday, July 11, 2011 @ 23:27:34 Author: eric Revision: 131232 upgpkg: lvm2 2.02.86-1 Upstream update, Removed old patch Modified: lvm2/trunk/PKGBUILD Deleted: lvm2/trunk/Be-quiet-on-removing-cache-on-read-only-fs.diff -+ Be-quiet-on-removing-cache-on-read-only-fs.diff | 17 - PKGBUILD| 12 2 files changed, 4 insertions(+), 25 deletions(-) Deleted: Be-quiet-on-removing-cache-on-read-only-fs.diff === --- Be-quiet-on-removing-cache-on-read-only-fs.diff 2011-07-12 01:58:17 UTC (rev 131231) +++ Be-quiet-on-removing-cache-on-read-only-fs.diff 2011-07-12 03:27:34 UTC (rev 131232) @@ -1,17 +0,0 @@ -Do not issue an error message when unable to remove .cache on read-only fs. -=== -RCS file: /cvs/lvm2/LVM2/lib/filters/filter-persistent.c,v -retrieving revision 1.49 -retrieving revision 1.50 -diff -u -r1.49 -r1.50 LVM2/lib/filters/filter-persistent.c 2011/04/22 12:05:33 1.49 -+++ LVM2/lib/filters/filter-persistent.c 2011/05/12 12:42:48 1.50 -@@ -108,7 +108,7 @@ - log_very_verbose(Obtaining device list from -udev. Removing obolete %s., -pf-file); -- if (unlink(pf-file) 0) -+ if (unlink(pf-file) 0 errno != EROFS) - log_sys_error(unlink, pf-file); - } - return 1; Modified: PKGBUILD === --- PKGBUILD2011-07-12 01:58:17 UTC (rev 131231) +++ PKGBUILD2011-07-12 03:27:34 UTC (rev 131232) @@ -4,9 +4,9 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.85 +pkgver=2.02.86 _pkgverlvm=${pkgver} -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64') url=http://sourceware.org/lvm2/; license=('GPL2' 'LGPL2.1') @@ -14,23 +14,19 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz lvm2_install lvm2_hook -Be-quiet-on-removing-cache-on-read-only-fs.diff 11-dm-initramfs.rules) -md5sums=('91785ca438e5ce679dd3a386b183d552' +md5sums=('3b42dec4d15ad106302a35149082a20e' 'dcb82506d732cc7b10159a89b579dba8' '8d613b84a175cd85f752a75198e40e15' - '6db89da27928d2415a8e26cd0a842712' '69e40679cd8b3658bfc619e48baae125') -sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7' +sha1sums=('f435b389cc11c8f415244fe382f3839d1676770c' '7f108b2f2056eb050fc898bf5190ecf9145aed8a' 'a0e0513c2efb183006e57e595d93ce18be297928' - '6d7dd04be291d7537235704c816a701fd5beacc0' 'f6a554eea9557c3c236df2943bb6e7e723945c41') build() { cd ${srcdir}/LVM2.${_pkgverlvm} sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh - patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff unset LDFLAGS ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ --includedir=/usr/include --with-usrlibdir=/usr/lib \