From f676c2f568b9c75daa3e2b688978b877f950953d Mon Sep 17 00:00:00 2001 From: root Date: Wed, 30 May 2012 00:02:28 +0000 Subject: Wed May 30 00:02:27 UTC 2012 --- core/mdadm/PKGBUILD | 12 +++---- core/mdadm/mdadm_install | 70 +++++++++++++++++++-------------------- core/mdadm/mdadm_udev_install | 6 ++-- core/nfs-utils/PKGBUILD | 16 +++++---- core/nfs-utils/blkmapd.service | 11 ++++++ core/nfs-utils/rpc-mountd.service | 2 +- 6 files changed, 67 insertions(+), 50 deletions(-) create mode 100644 core/nfs-utils/blkmapd.service (limited to 'core') diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index d270ca783..3c905ace6 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159240 2012-05-18 16:47:23Z tpowa $ +# $Id: PKGBUILD 160025 2012-05-28 10:25:39Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Judd Vinet pkgname=mdadm -pkgver=3.2.4 -pkgrel=1 +pkgver=3.2.5 +pkgrel=2 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') @@ -21,12 +21,12 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm.service disable-werror.patch) replaces=('raidtools') -md5sums=('c25007b981e0f5362eacdad385ff0e15' +md5sums=('83ba4a6249ae24677e915e44c9cfcc58' '8333d405f550317c2bacd5510bf1cb60' '00cbed931db4f15b6ce49e3e7d433966' - '9b01e96b6c3c218fb61628c9281fe688' + '609d10888727710cb20db7ac3e096116' 'fbb5542d9bdf87441a11dd7e7a0a17f8' - '2318b99701dba9b01a6891c62be7bc1c' + 'd1d8e9eb81ce9347de74f3c84a9db09e' 'aafb5f9ac8437a284cbf948b9b13b179' '4ad87b74a4bc9a34621280abe0e0c3e4') diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install index b53258676..cf6159e40 100644 --- a/core/mdadm/mdadm_install +++ b/core/mdadm/mdadm_install @@ -1,45 +1,45 @@ -# vim: set ft=sh: - -build() -{ - MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " - BINARIES="" - FILES="" - SCRIPT="mdadm" +#!/bin/bash + +build() { + add_checked_modules -f 'dm-' 'drivers/md/*' + # check if a custom mdadm.conf exists if grep -q ^ARRAY /etc/mdadm.conf; then echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi add_binary "/sbin/mdassemble" + + add_runscript } -help () -{ -cat<,dev0,dev1,...,devn - md=,uuid - - for partitionable raid arrays with persistent superblocks: - md=d,dev0,dev1,...,devn - md=d,uuid - - Parameters: - - = the number of the md device: - 0 means md0, 1 means md1, ... - - : e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 - or 0900878d:f95f6057:c39a36e9:55efa60a - Examples: - - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 - This will setup 2 md partitionable arrays. - - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 - This will setup 2 md arrays with persistent superblocks. +help() { + cat <,dev0,dev1,...,devn + md=,uuid +- for partitionable raid arrays with persistent superblocks: + md=d,dev0,dev1,...,devn + md=d,uuid + +Parameters: +- = the number of the md device: + 0 means md0, 1 means md1, ... +- : e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 + or 0900878d:f95f6057:c39a36e9:55efa60a +Examples: +- md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 + This will setup 2 md partitionable arrays. +- md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 + This will setup 2 md arrays with persistent superblocks. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install index be653fc74..f6f5de4ad 100644 --- a/core/mdadm/mdadm_udev_install +++ b/core/mdadm/mdadm_udev_install @@ -1,7 +1,7 @@ #!/bin/bash build() { - MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-")" + add_checked_modules -f 'dm-' 'drivers/md/*' # check if a custom mdadm.conf exists if grep -qw ^ARRAY "$BASEDIR/etc/mdadm.conf"; then @@ -15,7 +15,9 @@ build() { help() { cat < # Contributor: John Proctor # Contributor: dibblethewrecker @@ -6,8 +6,8 @@ # Contributor: Marco Lima pkgname=nfs-utils -pkgver=1.2.5 -pkgrel=4 +pkgver=1.2.6 +pkgrel=1 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' @@ -34,9 +34,10 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn nfsd.service var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount + blkmapd.service nfs-utils.conf) install=nfs-utils.install -md5sums=('8395ac770720b83c5c469f88306d7765' +md5sums=('8be543ca270c2234ff18f8c8d35e0d37' 'dd0d65fc6e8f422fa12520813098264b' 'f73f197a16b02c3e248488ec35c4cf43' 'e619f18354ff958ed624d05d08853d8f' @@ -48,13 +49,14 @@ md5sums=('8395ac770720b83c5c469f88306d7765' '7674106eaaa4c149bccd4f05fe3604e9' '4f4827dfc93008dfadd0a530ad0872b2' '38855936dc55a5afe37d84edc0f11066' - '8d888de677a217c5e5f7244a2e3a2d3a' + '965311784d49a7d126d512cadbe91deb' 'e05705d9ccccaeaeb1ecaee20adc05bc' 'd7df7bc311fd95c5b80017dd1741570d' '2e72ee082cba5d3ec6f51d2a105664da' '5d33d2e754fd37280365b287603bac90' '1cd65909fa0983047f3f06a3ab352401' '02a34835aa077146a90eb7d191e612d0' + '8ffc2ebe932d29efe17d6f3f23d5b975' '8ac484023d786766d287ccbe878ae4ba') build() { @@ -74,6 +76,8 @@ build() { package() { cd $srcdir/${pkgname}-${pkgver} + # fix make install + mkdir -p $pkgdir/sbin make DESTDIR=$pkgdir install # support python2 (FS#25120) @@ -91,7 +95,7 @@ package() { install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf # systemd files for i in ${srcdir}/*.{service,mount}; do - install -D -m 644 $i "$pkgdir/"usr/lib/systemd/system/$(basename $i) + install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}" done install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf # directories diff --git a/core/nfs-utils/blkmapd.service b/core/nfs-utils/blkmapd.service new file mode 100644 index 000000000..16cb68bbb --- /dev/null +++ b/core/nfs-utils/blkmapd.service @@ -0,0 +1,11 @@ +[Unit] +Description=pNFS block layout mapping daemon +After=var-lib-nfs-rpc_pipefs.mount nfsd.service +Requires=var-lib-nfs-rpc_pipefs.mount + +[Service] +Type=forking +ExecStart=/usr/sbin/blkmapd + +[Install] +WantedBy=multi-user.target diff --git a/core/nfs-utils/rpc-mountd.service b/core/nfs-utils/rpc-mountd.service index 917e1b444..edd8c851d 100644 --- a/core/nfs-utils/rpc-mountd.service +++ b/core/nfs-utils/rpc-mountd.service @@ -1,5 +1,5 @@ [Unit] -Description=NFSv2/3 Mount Daemon +Description=NFS Mount Daemon After=rpcbind.service nfsd.service Requires=rpcbind.service nfsd.service -- cgit v1.2.3-54-g00ecf