[arch-commits] Commit in lvm2/repos (16 files)
Thomas Bächler
thomas at archlinux.org
Mon Oct 15 21:23:51 UTC 2012
Date: Monday, October 15, 2012 @ 17:23:50
Author: thomas
Revision: 168776
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
lvm2/repos/testing-i686/
lvm2/repos/testing-i686/11-dm-initramfs.rules
(from rev 168775, lvm2/trunk/11-dm-initramfs.rules)
lvm2/repos/testing-i686/PKGBUILD
(from rev 168775, lvm2/trunk/PKGBUILD)
lvm2/repos/testing-i686/lvm-on-crypt.service
(from rev 168775, lvm2/trunk/lvm-on-crypt.service)
lvm2/repos/testing-i686/lvm.service
(from rev 168775, lvm2/trunk/lvm.service)
lvm2/repos/testing-i686/lvm2.conf
(from rev 168775, lvm2/trunk/lvm2.conf)
lvm2/repos/testing-i686/lvm2_hook
(from rev 168775, lvm2/trunk/lvm2_hook)
lvm2/repos/testing-i686/lvm2_install
(from rev 168775, lvm2/trunk/lvm2_install)
lvm2/repos/testing-x86_64/
lvm2/repos/testing-x86_64/11-dm-initramfs.rules
(from rev 168775, lvm2/trunk/11-dm-initramfs.rules)
lvm2/repos/testing-x86_64/PKGBUILD
(from rev 168775, lvm2/trunk/PKGBUILD)
lvm2/repos/testing-x86_64/lvm-on-crypt.service
(from rev 168775, lvm2/trunk/lvm-on-crypt.service)
lvm2/repos/testing-x86_64/lvm.service
(from rev 168775, lvm2/trunk/lvm.service)
lvm2/repos/testing-x86_64/lvm2.conf
(from rev 168775, lvm2/trunk/lvm2.conf)
lvm2/repos/testing-x86_64/lvm2_hook
(from rev 168775, lvm2/trunk/lvm2_hook)
lvm2/repos/testing-x86_64/lvm2_install
(from rev 168775, lvm2/trunk/lvm2_install)
--------------------------------------+
testing-i686/11-dm-initramfs.rules | 3 +
testing-i686/PKGBUILD | 72 +++++++++++++++++++++++++++++++++
testing-i686/lvm-on-crypt.service | 16 +++++++
testing-i686/lvm.service | 16 +++++++
testing-i686/lvm2.conf | 2
testing-i686/lvm2_hook | 24 +++++++++++
testing-i686/lvm2_install | 31 ++++++++++++++
testing-x86_64/11-dm-initramfs.rules | 3 +
testing-x86_64/PKGBUILD | 72 +++++++++++++++++++++++++++++++++
testing-x86_64/lvm-on-crypt.service | 16 +++++++
testing-x86_64/lvm.service | 16 +++++++
testing-x86_64/lvm2.conf | 2
testing-x86_64/lvm2_hook | 24 +++++++++++
testing-x86_64/lvm2_install | 31 ++++++++++++++
14 files changed, 328 insertions(+)
Copied: lvm2/repos/testing-i686/11-dm-initramfs.rules (from rev 168775, lvm2/trunk/11-dm-initramfs.rules)
===================================================================
--- testing-i686/11-dm-initramfs.rules (rev 0)
+++ testing-i686/11-dm-initramfs.rules 2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,3 @@
+# needed with new udev/mkinitcpio and as implemented in dracut:
+# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
+SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
Copied: lvm2/repos/testing-i686/PKGBUILD (from rev 168775, lvm2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgbase=lvm2
+pkgname=('lvm2' 'device-mapper')
+pkgver=2.02.98
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://sourceware.org/lvm2/"
+license=('GPL2' 'LGPL2.1')
+groups=('base')
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
+ lvm2_install
+ lvm2_hook
+ 11-dm-initramfs.rules
+ lvm.service
+ lvm-on-crypt.service
+ lvm2.conf)
+sha1sums=('077425115b164c335a9930df745943e9ea666a8a'
+ '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8'
+ '3e1680f9b76ce9150d08865d99db90fd15532271'
+ 'cedc9948123c870f9c5aa3357d0075b41a9c8135'
+ 'f6a554eea9557c3c236df2943bb6e7e723945c41'
+ 'edce6b6e8d03f7cbad4bfff49fab01d618415be8'
+ '652fb58dd7676caa0515f0a06d537744e071c6cf'
+ 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4')
+
+build() {
+ cd "${srcdir}/LVM2.${pkgver}"
+ unset LDFLAGS
+
+ ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
+ --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \
+ --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules \
+ --with-default-locking-dir=/run/lock/lvm
+ make
+}
+
+package_device-mapper() {
+ pkgdesc="Device mapper userspace library and tools"
+ url="http://sourceware.org/dm/"
+ depends=('glibc' 'udev')
+
+ cd "${srcdir}/LVM2.${pkgver}"
+ make DESTDIR="${pkgdir}" install_device-mapper
+ # extra udev rule for device-mapper in initramfs
+ install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
+}
+
+package_lvm2() {
+ pkgdesc="Logical Volume Manager 2 utilities"
+ depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
+ conflicts=('lvm' 'mkinitcpio<0.7')
+ backup=('etc/lvm/lvm.conf')
+ options=('!makeflags')
+
+ cd "${srcdir}/LVM2.${pkgver}"
+ make DESTDIR="${pkgdir}" install_lvm2
+ # install applib
+ make -C liblvm DESTDIR="${pkgdir}" install
+ # /etc directories
+ install -d "${pkgdir}"/etc/lvm/{archive,backup}
+ # mkinitcpio hook
+ install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/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"
+}
Copied: lvm2/repos/testing-i686/lvm-on-crypt.service (from rev 168775, lvm2/trunk/lvm-on-crypt.service)
===================================================================
--- testing-i686/lvm-on-crypt.service (rev 0)
+++ testing-i686/lvm-on-crypt.service 2012-10-15 21:23:50 UTC (rev 168776)
@@ -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 --available y
+Type=oneshot
+TimeoutSec=0
+RemainAfterExit=yes
+
+[Install]
+WantedBy=basic.target
Copied: lvm2/repos/testing-i686/lvm.service (from rev 168775, lvm2/trunk/lvm.service)
===================================================================
--- testing-i686/lvm.service (rev 0)
+++ testing-i686/lvm.service 2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,16 @@
+[Unit]
+Description=LVM activation
+DefaultDependencies=no
+Requires=systemd-udev-settle.service
+After=systemd-udev-settle.service
+Before=basic.target shutdown.target
+Conflicts=shutdown.target
+
+[Service]
+ExecStart=/sbin/vgchange --available y
+Type=oneshot
+TimeoutSec=0
+RemainAfterExit=yes
+
+[Install]
+WantedBy=basic.target
Copied: lvm2/repos/testing-i686/lvm2.conf (from rev 168775, lvm2/trunk/lvm2.conf)
===================================================================
--- testing-i686/lvm2.conf (rev 0)
+++ testing-i686/lvm2.conf 2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,2 @@
+d /run/lock/lvm 0755 root root -
+d /run/lvm 0755 root root -
Copied: lvm2/repos/testing-i686/lvm2_hook (from rev 168775, lvm2/trunk/lvm2_hook)
===================================================================
--- testing-i686/lvm2_hook (rev 0)
+++ testing-i686/lvm2_hook 2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,24 @@
+#!/usr/bin/ash
+
+run_hook() {
+ local pvdev
+
+ modprobe -q dm-mod >/dev/null 2>&1
+
+ # If the lvmwait= parameter has been specified on the command line
+ # wait for the device(s) before trying to activate the volume group(s)
+ for pvdev in ${lvmwait//,/ }; do
+ poll_device ${pvdev} ${rootdelay}
+ done
+
+ msg "Activating logical volumes..."
+ [ -d /etc/lvm ] && lvm vgscan
+
+ if [ -n "$quiet" ]; then
+ lvm vgchange --sysinit -a y >/dev/null
+ else
+ lvm vgchange --sysinit -a y
+ fi
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Copied: lvm2/repos/testing-i686/lvm2_install (from rev 168775, lvm2/trunk/lvm2_install)
===================================================================
--- testing-i686/lvm2_install (rev 0)
+++ testing-i686/lvm2_install 2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+build() {
+ local mod
+ for mod in dm-mod dm-snapshot dm-mirror; do
+ add_module "$mod"
+ done
+
+ add_binary "/sbin/lvm"
+ add_binary "/sbin/dmsetup"
+ add_file "/usr/lib/udev/rules.d/10-dm.rules"
+ add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+ add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+ add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
+ add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+
+ add_runscript
+}
+
+help() {
+ cat <<HELPEOF
+This hook loads the necessary modules for an LVM2 root device.
+
+The optional lvmwait= parameter followed by a comma-separated
+list of device names can be given on the command line.
+It will cause the hook to wait until all given devices exist
+before trying to scan and activate any volume groups.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Copied: lvm2/repos/testing-x86_64/11-dm-initramfs.rules (from rev 168775, lvm2/trunk/11-dm-initramfs.rules)
===================================================================
--- testing-x86_64/11-dm-initramfs.rules (rev 0)
+++ testing-x86_64/11-dm-initramfs.rules 2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,3 @@
+# needed with new udev/mkinitcpio and as implemented in dracut:
+# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
+SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
Copied: lvm2/repos/testing-x86_64/PKGBUILD (from rev 168775, lvm2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgbase=lvm2
+pkgname=('lvm2' 'device-mapper')
+pkgver=2.02.98
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://sourceware.org/lvm2/"
+license=('GPL2' 'LGPL2.1')
+groups=('base')
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
+ lvm2_install
+ lvm2_hook
+ 11-dm-initramfs.rules
+ lvm.service
+ lvm-on-crypt.service
+ lvm2.conf)
+sha1sums=('077425115b164c335a9930df745943e9ea666a8a'
+ '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8'
+ '3e1680f9b76ce9150d08865d99db90fd15532271'
+ 'cedc9948123c870f9c5aa3357d0075b41a9c8135'
+ 'f6a554eea9557c3c236df2943bb6e7e723945c41'
+ 'edce6b6e8d03f7cbad4bfff49fab01d618415be8'
+ '652fb58dd7676caa0515f0a06d537744e071c6cf'
+ 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4')
+
+build() {
+ cd "${srcdir}/LVM2.${pkgver}"
+ unset LDFLAGS
+
+ ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
+ --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \
+ --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules \
+ --with-default-locking-dir=/run/lock/lvm
+ make
+}
+
+package_device-mapper() {
+ pkgdesc="Device mapper userspace library and tools"
+ url="http://sourceware.org/dm/"
+ depends=('glibc' 'udev')
+
+ cd "${srcdir}/LVM2.${pkgver}"
+ make DESTDIR="${pkgdir}" install_device-mapper
+ # extra udev rule for device-mapper in initramfs
+ install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
+}
+
+package_lvm2() {
+ pkgdesc="Logical Volume Manager 2 utilities"
+ depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
+ conflicts=('lvm' 'mkinitcpio<0.7')
+ backup=('etc/lvm/lvm.conf')
+ options=('!makeflags')
+
+ cd "${srcdir}/LVM2.${pkgver}"
+ make DESTDIR="${pkgdir}" install_lvm2
+ # install applib
+ make -C liblvm DESTDIR="${pkgdir}" install
+ # /etc directories
+ install -d "${pkgdir}"/etc/lvm/{archive,backup}
+ # mkinitcpio hook
+ install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/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"
+}
Copied: lvm2/repos/testing-x86_64/lvm-on-crypt.service (from rev 168775, lvm2/trunk/lvm-on-crypt.service)
===================================================================
--- testing-x86_64/lvm-on-crypt.service (rev 0)
+++ testing-x86_64/lvm-on-crypt.service 2012-10-15 21:23:50 UTC (rev 168776)
@@ -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 --available y
+Type=oneshot
+TimeoutSec=0
+RemainAfterExit=yes
+
+[Install]
+WantedBy=basic.target
Copied: lvm2/repos/testing-x86_64/lvm.service (from rev 168775, lvm2/trunk/lvm.service)
===================================================================
--- testing-x86_64/lvm.service (rev 0)
+++ testing-x86_64/lvm.service 2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,16 @@
+[Unit]
+Description=LVM activation
+DefaultDependencies=no
+Requires=systemd-udev-settle.service
+After=systemd-udev-settle.service
+Before=basic.target shutdown.target
+Conflicts=shutdown.target
+
+[Service]
+ExecStart=/sbin/vgchange --available y
+Type=oneshot
+TimeoutSec=0
+RemainAfterExit=yes
+
+[Install]
+WantedBy=basic.target
Copied: lvm2/repos/testing-x86_64/lvm2.conf (from rev 168775, lvm2/trunk/lvm2.conf)
===================================================================
--- testing-x86_64/lvm2.conf (rev 0)
+++ testing-x86_64/lvm2.conf 2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,2 @@
+d /run/lock/lvm 0755 root root -
+d /run/lvm 0755 root root -
Copied: lvm2/repos/testing-x86_64/lvm2_hook (from rev 168775, lvm2/trunk/lvm2_hook)
===================================================================
--- testing-x86_64/lvm2_hook (rev 0)
+++ testing-x86_64/lvm2_hook 2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,24 @@
+#!/usr/bin/ash
+
+run_hook() {
+ local pvdev
+
+ modprobe -q dm-mod >/dev/null 2>&1
+
+ # If the lvmwait= parameter has been specified on the command line
+ # wait for the device(s) before trying to activate the volume group(s)
+ for pvdev in ${lvmwait//,/ }; do
+ poll_device ${pvdev} ${rootdelay}
+ done
+
+ msg "Activating logical volumes..."
+ [ -d /etc/lvm ] && lvm vgscan
+
+ if [ -n "$quiet" ]; then
+ lvm vgchange --sysinit -a y >/dev/null
+ else
+ lvm vgchange --sysinit -a y
+ fi
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Copied: lvm2/repos/testing-x86_64/lvm2_install (from rev 168775, lvm2/trunk/lvm2_install)
===================================================================
--- testing-x86_64/lvm2_install (rev 0)
+++ testing-x86_64/lvm2_install 2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+build() {
+ local mod
+ for mod in dm-mod dm-snapshot dm-mirror; do
+ add_module "$mod"
+ done
+
+ add_binary "/sbin/lvm"
+ add_binary "/sbin/dmsetup"
+ add_file "/usr/lib/udev/rules.d/10-dm.rules"
+ add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+ add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+ add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
+ add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+
+ add_runscript
+}
+
+help() {
+ cat <<HELPEOF
+This hook loads the necessary modules for an LVM2 root device.
+
+The optional lvmwait= parameter followed by a comma-separated
+list of device names can be given on the command line.
+It will cause the hook to wait until all given devices exist
+before trying to scan and activate any volume groups.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
More information about the arch-commits
mailing list