diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-01 15:38:30 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-01 15:38:30 +0100 |
| commit | b63a03da360e5a18e9044e7058ae69898db5ffb0 (patch) | |
| tree | 2901728a2c53e2eb590d577db1531ee2976a2cbf /core/dmraid | |
| parent | 73346505421c2d923e13e2020dd31ddd764b8fe4 (diff) | |
| parent | 26ac5932cb02318206fa6a528ed4bd82ad6af87c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/blender/PKGBUILD
community/cdfs/PKGBUILD
community/cdfs/cdfs.install
community/mc/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/open-vm-tools-modules/modprobe.conf
community/open-vm-tools-modules/open-vm-tools-modules.install
community/open-vm-tools/PKGBUILD
community/open-vm-tools/open-vm-tools.conf.d
community/open-vm-tools/open-vm-tools.rc.d
community/open-vm-tools/scripts-network-FS19541.patch
community/pekwm/PKGBUILD
community/r8168-lts/PKGBUILD
community/simutrans/PKGBUILD
community/spectrwm/PKGBUILD
community/supertuxkart/PKGBUILD
community/tp_smapi/PKGBUILD
community/tp_smapi/tp_smapi.install
community/vhba-module/PKGBUILD
community/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/glibc/PKGBUILD
extra/fcgi/PKGBUILD
extra/gst-plugins-bad/PKGBUILD
extra/imap/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/lirc/PKGBUILD
extra/lirc/lirc.install
extra/llvm/PKGBUILD
extra/nvidia-304xx-utils/PKGBUILD
extra/ruby/PKGBUILD
extra/xscreensaver/PKGBUILD
Diffstat (limited to 'core/dmraid')
| -rw-r--r-- | core/dmraid/PKGBUILD | 8 | ||||
| -rw-r--r-- | core/dmraid/dmraid.service | 3 | ||||
| -rw-r--r-- | core/dmraid/dmraid_install | 1 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD index a925e8ae1..91063cf9a 100644 --- a/core/dmraid/PKGBUILD +++ b/core/dmraid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162150 2012-06-22 12:53:50Z dreisner $ +# $Id: PKGBUILD 173944 2012-12-28 19:27:14Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=7 +pkgrel=8 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') @@ -19,10 +19,10 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 dmraid.service) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - '2297d23cee1aef23ec6ad8d6d1870356' + 'dea048cc09b49b02da1009adae563866' 'faec669dc85f87187b45b5d3968efe2c' '56a8bb0ece8d206cd8efb504ee072ddd' - 'de0af1fdb9ed4c109b8119160167d2e9') + '1cd201496e52bd05c1c3048bf6dd809f') build() { cd "$pkgname/1.0.0.rc16-3/$pkgname" diff --git a/core/dmraid/dmraid.service b/core/dmraid/dmraid.service index 1fd142ff2..a31f8b39f 100644 --- a/core/dmraid/dmraid.service +++ b/core/dmraid/dmraid.service @@ -7,9 +7,8 @@ Before=basic.target shutdown.target Conflicts=shutdown.target [Service] -ExecStart=/sbin/dmraid --ignorelocking --activate y -Z Type=oneshot -TimeoutSec=0 +ExecStart=/sbin/dmraid --ignorelocking --activate y -Z RemainAfterExit=true [Install] diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install index d3238c1f7..2003b5cdf 100644 --- a/core/dmraid/dmraid_install +++ b/core/dmraid/dmraid_install @@ -9,6 +9,7 @@ build() { 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/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" add_runscript } |