[arch-commits] Commit in lvm2/trunk (4 files)

2017-09-28 Thread Christian Hesse 
Date: Thursday, September 28, 2017 @ 20:22:57
  Author: eworm
Revision: 306454

upgpkg: lvm2 2.02.174-2

toollib: fix parentheses in assignment + comparison (FS#55760)

Added:
  lvm2/trunk/0001-lvm2-make-sockets-static.patch
(from rev 306453, lvm2/trunk/01-lvm2-make-sockets-static.patch)
  lvm2/trunk/0002-toollib_fix_parentheses_in_assignment_comparison.patch
Modified:
  lvm2/trunk/PKGBUILD
Deleted:
  lvm2/trunk/01-lvm2-make-sockets-static.patch

-+
 0001-lvm2-make-sockets-static.patch |   20 ++
 0002-toollib_fix_parentheses_in_assignment_comparison.patch |   19 +
 01-lvm2-make-sockets-static.patch   |   20 --
 PKGBUILD|   13 --
 4 files changed, 48 insertions(+), 24 deletions(-)

Copied: lvm2/trunk/0001-lvm2-make-sockets-static.patch (from rev 306453, 
lvm2/trunk/01-lvm2-make-sockets-static.patch)
===
--- 0001-lvm2-make-sockets-static.patch (rev 0)
+++ 0001-lvm2-make-sockets-static.patch 2017-09-28 20:22:57 UTC (rev 306454)
@@ -0,0 +1,20 @@
+diff -Nur LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in 
LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in
+--- LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in  
2014-04-10 17:38:46.0 +0200
 LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in   2014-04-26 
14:21:10.097269315 +0200
+@@ -8,6 +8,3 @@
+ ListenFIFO=@DEFAULT_DM_RUN_DIR@/dmeventd-client
+ SocketMode=0600
+ RemoveOnStop=true
+-
+-[Install]
+-WantedBy=sockets.target
+diff -Nur LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in 
LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in
+--- LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in  
2014-04-10 17:38:46.0 +0200
 LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in   
2014-04-26 14:21:15.287156152 +0200
+@@ -7,6 +7,3 @@
+ ListenStream=@DEFAULT_RUN_DIR@/lvmetad.socket
+ SocketMode=0600
+ RemoveOnStop=true
+-
+-[Install]
+-WantedBy=sysinit.target

Added: 0002-toollib_fix_parentheses_in_assignment_comparison.patch
===
--- 0002-toollib_fix_parentheses_in_assignment_comparison.patch 
(rev 0)
+++ 0002-toollib_fix_parentheses_in_assignment_comparison.patch 2017-09-28 
20:22:57 UTC (rev 306454)
@@ -0,0 +1,19 @@
+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;
+   }

Deleted: 01-lvm2-make-sockets-static.patch
===
--- 01-lvm2-make-sockets-static.patch   2017-09-28 19:01:49 UTC (rev 306453)
+++ 01-lvm2-make-sockets-static.patch   2017-09-28 20:22:57 UTC (rev 306454)
@@ -1,20 +0,0 @@
-diff -Nur LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in 
LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in
 LVM2.2.02.106.orig/scripts/dm_event_systemd_red_hat.socket.in  
2014-04-10 17:38:46.0 +0200
-+++ LVM2.2.02.106/scripts/dm_event_systemd_red_hat.socket.in   2014-04-26 
14:21:10.097269315 +0200
-@@ -8,6 +8,3 @@
- ListenFIFO=@DEFAULT_DM_RUN_DIR@/dmeventd-client
- SocketMode=0600
- RemoveOnStop=true
--
--[Install]
--WantedBy=sockets.target
-diff -Nur LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in 
LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in
 LVM2.2.02.106.orig/scripts/lvm2_lvmetad_systemd_red_hat.socket.in  
2014-04-10 17:38:46.0 +0200
-+++ LVM2.2.02.106/scripts/lvm2_lvmetad_systemd_red_hat.socket.in   
2014-04-26 14:21:15.287156152 +0200
-@@ -7,6 +7,3 @@
- ListenStream=@DEFAULT_RUN_DIR@/lvmetad.socket
- SocketMode=0600
- RemoveOnStop=true
--
--[Install]
--WantedBy=sysinit.target

Modified: PKGBUILD
===
--- PKGBUILD2017-09-28 19:01:49 UTC (rev 306453)
+++ PKGBUILD2017-09-28 20:22:57 UTC (rev 306454)
@@ -5,7 +5,7 @@
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.174
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/;
 license=('GPL2' 'LGPL2.1')
@@

[arch-commits] Commit in lvm2/trunk (4 files)

2014-04-11 Thread Thomas Bächler 
Date: Friday, April 11, 2014 @ 23:59:45
  Author: thomas
Revision: 210210

upgpkg: lvm2 2.02.106-1

Modified:
  lvm2/trunk/PKGBUILD
Deleted:
  lvm2/trunk/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch
  lvm2/trunk/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch
  lvm2/trunk/lvm2-2.02.105-readline-6.3.patch

-+
 0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch |  199 
--
 0002-snapshot-zero-cow-header-for-read-only-snapshot.patch  |   74 ---
 PKGBUILD|   20 -
 lvm2-2.02.105-readline-6.3.patch|   48 --
 4 files changed, 5 insertions(+), 336 deletions(-)

Deleted: 0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch
===
--- 0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch 
2014-04-11 21:45:37 UTC (rev 210209)
+++ 0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch 
2014-04-11 21:59:45 UTC (rev 210210)
@@ -1,199 +0,0 @@
-From a29d36c9ac41aa3aa4818c277c9c0e20cbd6175b Mon Sep 17 00:00:00 2001
-From: Peter Rajnoha prajn...@redhat.com
-Date: Mon, 10 Feb 2014 13:28:13 +0100
-Subject: [PATCH 1/2] wiping: wipe DM_snapshot_cow signature without prompt in
- newly created LVs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The libblkid can detect DM_snapshot_cow signature and when creating
-new LVs with blkid wiping used (allocation/use_blkid_wiping=1 lvm.conf
-setting and --wipe y used at the same time - which it is by default).
-
-Do not issue any prompts about this signature when new LV is created
-and just wipe it right away without asking questions. Still keep the
-log in verbose mode though.
-
-Conflicts:
-   WHATS_NEW
-   lib/device/dev-type.c
-
-[backported to 2.02.105 by Thomas Bächler, tho...@archlinux.org]

- WHATS_NEW   |  2 ++
- lib/device/dev-type.c   | 47 ---
- lib/device/dev-type.h   |  6 +-
- lib/metadata/lv_manip.c |  4 +++-
- lib/metadata/metadata.c |  4 +++-
- 5 files changed, 45 insertions(+), 18 deletions(-)
-
-diff --git a/WHATS_NEW b/WHATS_NEW
-index 26b63ae..d2a3482 100644
 a/WHATS_NEW
-+++ b/WHATS_NEW
-@@ -1,3 +1,5 @@
-+  Wipe DM_snapshot_cow signature without prompt in new LVs with blkid wiping.
-+
- Version 2.02.105 - 20th January 2014
- 
-   Fix thin LV flagging for udev to skip scanning only if the LV is wiped.
-diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
-index 78b093c..d2ff71e 100644
 a/lib/device/dev-type.c
-+++ b/lib/device/dev-type.c
-@@ -449,17 +449,25 @@ out:
- 
- #ifdef BLKID_WIPING_SUPPORT
- 
-+static inline int _type_in_flag_list(const char *type, uint32_t flag_list)
-+{
-+  return (((flag_list  TYPE_LVM2_MEMBER)  !strcmp(type, 
LVM2_member)) ||
-+  ((flag_list  TYPE_LVM1_MEMBER)  !strcmp(type, 
LVM1_member)) ||
-+  ((flag_list  TYPE_DM_SNAPSHOT_COW)  !strcmp(type, 
DM_snapshot_cow)));
-+}
-+
- static int _blkid_wipe(blkid_probe probe, struct device *dev, const char 
*name,
-- int exclude_lvm_member, int yes, force_t force)
-+ uint32_t types_to_exclude, uint32_t types_no_prompt,
-+ int yes, force_t force)
- {
-+  static const char* msg_wiping = Wiping %s signature on %s.;
-   const char *offset = NULL, *type = NULL, *magic = NULL,
-  *usage = NULL, *label = NULL, *uuid = NULL;
-   loff_t offset_value;
-   size_t len;
- 
-   if (!blkid_probe_lookup_value(probe, TYPE, type, NULL)) {
--  if (exclude_lvm_member 
--  (!strcmp(type, LVM1_member) || !strcmp(type, 
LVM2_member)))
-+  if (_type_in_flag_list(type, types_to_exclude))
-   return 1;
-   if (!blkid_probe_lookup_value(probe, SBMAGIC_OFFSET, offset, 
NULL) 
-blkid_probe_lookup_value(probe, SBMAGIC, magic, len))
-@@ -483,12 +491,15 @@ static int _blkid_wipe(blkid_probe probe, struct device 
*dev, const char *name,
-   UUID=\%s\ TYPE=\%s\ USAGE=\%s\,
-name, offset, label, uuid, type, usage);
- 
--  if (!yes  (force == PROMPT) 
--  yes_no_prompt(WARNING: %s signature detected on %s at offset %s. 
--Wipe it? [y/n] , type, name, offset) != 'y')
--  return_0;
-+  if (!_type_in_flag_list(type, types_no_prompt)) {
-+  if (!yes  (force == PROMPT) 
-+  yes_no_prompt(WARNING: %s signature detected on %s at 
offset %s. 
-+Wipe it? [y/n] , type, name, offset) != 'y')
-+  return_0;
-+  log_print_unless_silent(msg_wiping, type, name);
-+  } else
-+

[arch-commits] Commit in lvm2/trunk (4 files)

2014-02-26 Thread Thomas Bächler 
Date: Wednesday, February 26, 2014 @ 23:37:42
  Author: thomas
Revision: 206458

upgpkg: lvm2 2.02.105-2: Fix FS#38710 and FS#38729

Added:
  lvm2/trunk/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch
  lvm2/trunk/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch
Modified:
  lvm2/trunk/PKGBUILD
  lvm2/trunk/sd-lvm2

-+
 0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch |  199 
++
 0002-snapshot-zero-cow-header-for-read-only-snapshot.patch  |   74 +++
 PKGBUILD|   19 
 sd-lvm2 |2 
 4 files changed, 287 insertions(+), 7 deletions(-)

Added: 0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch
===
--- 0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch 
(rev 0)
+++ 0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch 
2014-02-26 22:37:42 UTC (rev 206458)
@@ -0,0 +1,199 @@
+From a29d36c9ac41aa3aa4818c277c9c0e20cbd6175b Mon Sep 17 00:00:00 2001
+From: Peter Rajnoha prajn...@redhat.com
+Date: Mon, 10 Feb 2014 13:28:13 +0100
+Subject: [PATCH 1/2] wiping: wipe DM_snapshot_cow signature without prompt in
+ newly created LVs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The libblkid can detect DM_snapshot_cow signature and when creating
+new LVs with blkid wiping used (allocation/use_blkid_wiping=1 lvm.conf
+setting and --wipe y used at the same time - which it is by default).
+
+Do not issue any prompts about this signature when new LV is created
+and just wipe it right away without asking questions. Still keep the
+log in verbose mode though.
+
+Conflicts:
+   WHATS_NEW
+   lib/device/dev-type.c
+
+[backported to 2.02.105 by Thomas Bächler, tho...@archlinux.org]
+---
+ WHATS_NEW   |  2 ++
+ lib/device/dev-type.c   | 47 ---
+ lib/device/dev-type.h   |  6 +-
+ lib/metadata/lv_manip.c |  4 +++-
+ lib/metadata/metadata.c |  4 +++-
+ 5 files changed, 45 insertions(+), 18 deletions(-)
+
+diff --git a/WHATS_NEW b/WHATS_NEW
+index 26b63ae..d2a3482 100644
+--- a/WHATS_NEW
 b/WHATS_NEW
+@@ -1,3 +1,5 @@
++  Wipe DM_snapshot_cow signature without prompt in new LVs with blkid wiping.
++
+ Version 2.02.105 - 20th January 2014
+ 
+   Fix thin LV flagging for udev to skip scanning only if the LV is wiped.
+diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
+index 78b093c..d2ff71e 100644
+--- a/lib/device/dev-type.c
 b/lib/device/dev-type.c
+@@ -449,17 +449,25 @@ out:
+ 
+ #ifdef BLKID_WIPING_SUPPORT
+ 
++static inline int _type_in_flag_list(const char *type, uint32_t flag_list)
++{
++  return (((flag_list  TYPE_LVM2_MEMBER)  !strcmp(type, 
LVM2_member)) ||
++  ((flag_list  TYPE_LVM1_MEMBER)  !strcmp(type, 
LVM1_member)) ||
++  ((flag_list  TYPE_DM_SNAPSHOT_COW)  !strcmp(type, 
DM_snapshot_cow)));
++}
++
+ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char 
*name,
+- int exclude_lvm_member, int yes, force_t force)
++ uint32_t types_to_exclude, uint32_t types_no_prompt,
++ int yes, force_t force)
+ {
++  static const char* msg_wiping = Wiping %s signature on %s.;
+   const char *offset = NULL, *type = NULL, *magic = NULL,
+  *usage = NULL, *label = NULL, *uuid = NULL;
+   loff_t offset_value;
+   size_t len;
+ 
+   if (!blkid_probe_lookup_value(probe, TYPE, type, NULL)) {
+-  if (exclude_lvm_member 
+-  (!strcmp(type, LVM1_member) || !strcmp(type, 
LVM2_member)))
++  if (_type_in_flag_list(type, types_to_exclude))
+   return 1;
+   if (!blkid_probe_lookup_value(probe, SBMAGIC_OFFSET, offset, 
NULL) 
+blkid_probe_lookup_value(probe, SBMAGIC, magic, len))
+@@ -483,12 +491,15 @@ static int _blkid_wipe(blkid_probe probe, struct device 
*dev, const char *name,
+   UUID=\%s\ TYPE=\%s\ USAGE=\%s\,
+name, offset, label, uuid, type, usage);
+ 
+-  if (!yes  (force == PROMPT) 
+-  yes_no_prompt(WARNING: %s signature detected on %s at offset %s. 
+-Wipe it? [y/n] , type, name, offset) != 'y')
+-  return_0;
++  if (!_type_in_flag_list(type, types_no_prompt)) {
++  if (!yes  (force == PROMPT) 
++  yes_no_prompt(WARNING: %s signature detected on %s at 
offset %s. 
++Wipe it? [y/n] , type, name, offset) != 'y')
++  return_0;
++  log_print_unless_silent(msg_wiping, type, name);
++  } else
++

[arch-commits] Commit in lvm2/trunk (4 files)

2012-10-31 Thread Thomas Bächler 
Date: Wednesday, October 31, 2012 @ 20:46:01
  Author: thomas
Revision: 170085

Add After=/Requires= to systemd socket services and add post_upgrade warning.

Added:
  lvm2/trunk/lvm2.install
Modified:
  lvm2/trunk/PKGBUILD
  lvm2/trunk/dmeventd.service
  lvm2/trunk/lvmetad.service

--+
 PKGBUILD |5 +++--
 dmeventd.service |2 ++
 lvm2.install |   16 
 lvmetad.service  |2 ++
 4 files changed, 23 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-01 00:19:25 UTC (rev 170084)
+++ PKGBUILD2012-11-01 00:46:01 UTC (rev 170085)
@@ -26,10 +26,10 @@
   'ff0fdf0a3005a41acd4b36865056109effc3474b'
   'f6a554eea9557c3c236df2943bb6e7e723945c41'
   'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4'
-  '8bc78727dc3a15243eec72032688b5b65689bc5b'
+  '7c3e1ce29ac80698c1b558ac3a2848da84ea7d8d'
   '1d56f47a81350ae37ffbf61ee036fe31f4c5d504'
   '2fa406422a99cc3adcdfe6d59f4836fd0e55b17f'
-  'd795ad9436f3504c638d0405c233bb8ad465527b'
+  'c6073a48495376a33ee0ace5c3c9c32a5f559ddf'
   '370f497c28754169e427c8419bceb73f1cf64757')
 
 build() {
@@ -68,6 +68,7 @@
   conflicts=('lvm' 'mkinitcpio0.7')
   backup=('etc/lvm/lvm.conf')
   options=('!makeflags')
+  install=lvm2.install
 
   cd ${srcdir}/LVM2.${pkgver}
   make DESTDIR=${pkgdir} install_lvm2

Modified: dmeventd.service
===
--- dmeventd.service2012-11-01 00:19:25 UTC (rev 170084)
+++ dmeventd.service2012-11-01 00:46:01 UTC (rev 170085)
@@ -1,6 +1,8 @@
 [Unit]
 Description=Device-mapper event daemon
 Documentation=man:dmeventd(8)
+Requires=dmeventd.socket
+After=dmeventd.socket
 DefaultDependencies=no
 
 [Service]

Added: lvm2.install
===
--- lvm2.install(rev 0)
+++ lvm2.install2012-11-01 00:46:01 UTC (rev 170085)
@@ -0,0 +1,16 @@
+post_upgrade() {
+  if [ $(vercmp $2 2.02.98-2) -lt 0 ]; then
+echo Changes to the lvm2 package:
+echo  + Activating lvm in mkinitcpio now requires both the 'udev' and 
'lvm2' hooks.
+echo  + LVM volumes are automatically activated by udev (full hotplug 
support).
+echo  + You MUST have use_lvmetad = 1 in /etc/lvm/lvm.conf (the default).
+echo  + If you uncomment auto_activation_volume_list in 
/etc/lvm/lvm.conf, only the
+echovolumes listed there will be activated (default: it is commented 
out).
+if [ -f /etc/lvm/lvm.conf.pacnew ]; then
+echo WARNING: /etc/lvm/lvm.conf.pacnew exists. You MUST merge the 
required changes
+echo  into /etc/lvm/lvm.conf or LVM will fail to work.
+fi
+  fi
+}
+
+# vim:set ts=2 sw=2 et:

Modified: lvmetad.service
===
--- lvmetad.service 2012-11-01 00:19:25 UTC (rev 170084)
+++ lvmetad.service 2012-11-01 00:46:01 UTC (rev 170085)
@@ -1,6 +1,8 @@
 [Unit]
 Description=LVM2 metadata daemon
 Documentation=man:lvmetad(8)
+Requires=lvmetad.socket
+After=lvmetad.socket
 DefaultDependencies=no
 Conflicts=shutdown.target