diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-15 10:29:19 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-15 10:29:19 -0300 |
commit | 3ed19e74567434fe0bc82d835513b5b62f151838 (patch) | |
tree | 32427be3c933a7d96426b28d9c90eceb6ab8ff3d /core | |
parent | d5be0922f99093b4659507a4c17c664ac5c2f577 (diff) | |
parent | 8f1eb849d6de0031d4d91fb6d8780828b1ba924b (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gambas3/PKGBUILD
community-staging/libextractor/PKGBUILD
community/haveged/PKGBUILD
community/libfm/PKGBUILD
core/lvm2/PKGBUILD
extra/geeqie/PKGBUILD
staging/calligra/PKGBUILD
Diffstat (limited to 'core')
-rw-r--r-- | core/lvm2/PKGBUILD | 13 | ||||
-rw-r--r-- | core/lvm2/lvm-on-crypt.service | 16 |
2 files changed, 24 insertions, 5 deletions
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 308172cdc..62deb05a8 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163019 2012-07-05 20:37:09Z eric $ +# $Id: PKGBUILD 165226 2012-08-13 20:41:20Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.96 -pkgrel=3 +pkgver=2.02.97 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -15,13 +15,15 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvm2_hook 11-dm-initramfs.rules lvm.service + lvm-on-crypt.service lvm2.conf) -sha1sums=('29d5097f0ca92c7665f29f862eca78bcf981ff6f' - '12e9016485c415c344524e6e75e23dfa6ca097ac' +sha1sums=('ca92d976628246745f0981d1514a79a4a8e32314' + '9f0c6047fe3c275db7af20f383bd41744fcafc33' '3e1680f9b76ce9150d08865d99db90fd15532271' 'cedc9948123c870f9c5aa3357d0075b41a9c8135' 'f6a554eea9557c3c236df2943bb6e7e723945c41' '17df8689630a77e46899a8bd56997d9db896d5af' + '7336aa1d53db9c843916b2cbb433434e4e354a24' 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4') build() { @@ -65,5 +67,6 @@ package_lvm2() { install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" # systemd support install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service" + install -D -m644 "${srcdir}/lvm-on-crypt.service" "${pkgdir}/usr/lib/systemd/system/lvm-on-crypt.service" install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf" } diff --git a/core/lvm2/lvm-on-crypt.service b/core/lvm2/lvm-on-crypt.service new file mode 100644 index 000000000..4ade6c5b0 --- /dev/null +++ b/core/lvm2/lvm-on-crypt.service @@ -0,0 +1,16 @@ +[Unit] +Description=LVM activation of encrypted devices +DefaultDependencies=no +Requires=systemd-udev-settle.service +After=systemd-udev-settle.service cryptsetup.target +Before=shutdown.target +Conflicts=shutdown.target + +[Service] +ExecStart=/sbin/vgchange --sysinit --available y +Type=oneshot +TimeoutSec=0 +RemainAfterExit=yes + +[Install] +WantedBy=basic.target |