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

[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
===================================================================
--- PKGBUILD	2012-11-01 00:19:25 UTC (rev 170084)
+++ PKGBUILD	2012-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' 'mkinitcpio<0.7')
   backup=('etc/lvm/lvm.conf')
   options=('!makeflags')
+  install=lvm2.install
 
   cd "${srcdir}/LVM2.${pkgver}"
   make DESTDIR="${pkgdir}" install_lvm2

Modified: dmeventd.service
===================================================================
--- dmeventd.service	2012-11-01 00:19:25 UTC (rev 170084)
+++ dmeventd.service	2012-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.install	2012-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"
+    echo "   volumes 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