diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-27 21:52:14 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-27 21:52:14 +0200 |
| commit | 6fee6e650c46dcf94e9bd79efa2b2bf8a298d271 (patch) | |
| tree | 1059a01ced7c62a2eda6bdc9f455f4a9fa960f23 /core/lvm2 | |
| parent | a8cf07d2b8d0ba62d36021e51e72d7f2f47dd8d1 (diff) | |
| parent | 869e64b12767be3ef5b1e3628f337a9e116e2bbb (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/pawm/PKGBUILD
extra/kdesdk/PKGBUILD
Diffstat (limited to 'core/lvm2')
| -rw-r--r-- | core/lvm2/PKGBUILD | 12 | ||||
| -rw-r--r-- | core/lvm2/lvm-on-crypt.service | 2 | ||||
| -rw-r--r-- | core/lvm2/lvm.service | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 62deb05a8..2b421dcbf 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165226 2012-08-13 20:41:20Z eric $ +# $Id: PKGBUILD 169698 2012-10-26 08:32:04Z thomas $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.97 +pkgver=2.02.98 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://sourceware.org/lvm2/" @@ -17,13 +17,13 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvm.service lvm-on-crypt.service lvm2.conf) -sha1sums=('ca92d976628246745f0981d1514a79a4a8e32314' - '9f0c6047fe3c275db7af20f383bd41744fcafc33' +sha1sums=('077425115b164c335a9930df745943e9ea666a8a' + '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8' '3e1680f9b76ce9150d08865d99db90fd15532271' 'cedc9948123c870f9c5aa3357d0075b41a9c8135' 'f6a554eea9557c3c236df2943bb6e7e723945c41' - '17df8689630a77e46899a8bd56997d9db896d5af' - '7336aa1d53db9c843916b2cbb433434e4e354a24' + 'edce6b6e8d03f7cbad4bfff49fab01d618415be8' + '652fb58dd7676caa0515f0a06d537744e071c6cf' 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4') build() { diff --git a/core/lvm2/lvm-on-crypt.service b/core/lvm2/lvm-on-crypt.service index 4ade6c5b0..346c5ac8e 100644 --- a/core/lvm2/lvm-on-crypt.service +++ b/core/lvm2/lvm-on-crypt.service @@ -7,7 +7,7 @@ Before=shutdown.target Conflicts=shutdown.target [Service] -ExecStart=/sbin/vgchange --sysinit --available y +ExecStart=/sbin/vgchange --available y Type=oneshot TimeoutSec=0 RemainAfterExit=yes diff --git a/core/lvm2/lvm.service b/core/lvm2/lvm.service index 277d5a773..14269b1be 100644 --- a/core/lvm2/lvm.service +++ b/core/lvm2/lvm.service @@ -7,7 +7,7 @@ Before=basic.target shutdown.target Conflicts=shutdown.target [Service] -ExecStart=/sbin/vgchange --sysinit --available y +ExecStart=/sbin/vgchange --available y Type=oneshot TimeoutSec=0 RemainAfterExit=yes |