diff options
author | Andy Weidenbaum | 2017-03-12 12:21:17 -0700 |
---|---|---|
committer | Andy Weidenbaum | 2017-03-12 12:21:17 -0700 |
commit | e66d6229911e76facebbb9aa32fb7725533f9c9e (patch) | |
tree | 3eb9010c588200c92066ab0b23858daf79e0eb61 | |
parent | 1179c2c83a411427e4891f324cc295cccc08d18a (diff) | |
download | aur-e66d6229911e76facebbb9aa32fb7725533f9c9e.tar.gz |
update pkgver to 20170312, rm btrfs CoW handling
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 2 | ||||
-rw-r--r-- | bitcoin.install | 57 |
3 files changed, 3 insertions, 60 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Wed Mar 8 21:01:12 UTC 2017 +# Sun Mar 12 19:20:57 UTC 2017 pkgbase = bitcoin-core-git pkgdesc = Bitcoin Core headless P2P node - pkgver = 20170308 + pkgver = 20170312 pkgrel = 1 url = https://github.com/bitcoin/bitcoin install = bitcoin.install @@ -1,7 +1,7 @@ # Maintainer: Andy Weidenbaum <archbaum@gmail.com> pkgname=bitcoin-core-git -pkgver=20170308 +pkgver=20170312 pkgrel=1 pkgdesc="Bitcoin Core headless P2P node" arch=('i686' 'x86_64') diff --git a/bitcoin.install b/bitcoin.install index 4b0d2851e397..9f89c61570eb 100644 --- a/bitcoin.install +++ b/bitcoin.install @@ -3,10 +3,6 @@ _bc_group=bitcoin post_install() { _mkuser - # disable Copy-On-Write (btrfs directories only) - for _dir in /srv/bitcoin; do - _is_btrfs "$_dir" && _disable_cow "$_dir" - done chown -R $_bc_user:$_bc_group /etc/bitcoin /srv/bitcoin printf "%b\n" "$bitcoin" } @@ -22,11 +18,6 @@ post_remove() { rm -rf /srv/bitcoin } - -# ------------------------------------------------------------------------------ -# helper functions for creating bitcoin-core user / group -# ------------------------------------------------------------------------------ - _mkuser() { getent passwd $_bc_user &>/dev/null || { echo -n "Creating bitcoin user... " @@ -42,54 +33,6 @@ _rmuser() { echo "done" } - -# ------------------------------------------------------------------------------ -# helper functions for disabling btrfs Copy-On-Write (CoW) -# https://wiki.archlinux.org/index.php/Btrfs#Copy-On-Write_.28CoW.29 -# ------------------------------------------------------------------------------ - -# check if dir is btrfs -_is_btrfs() { - if [[ $(findmnt --target $1 --output FSTYPE --noheadings) == 'btrfs' ]]; then - return 0 - else - return 1 - fi -} - -# disable btrfs CoW -_chattrify() { - # original dir, with trailing slash stripped if it exists - _orig_dir=$( echo "$1" | sed 's@/$@@' ) - - # if original dir exists, back it up - [[ -d "$1" ]] && mv "$1" "${_orig_dir}"_old - - # re-make original dir - mkdir -p "$1" - - # set permissions on re-made dir - chmod "$2" "$1" - - # disable btrfs CoW on re-made dir - chattr +C "$1" - - # recursive copy to restore backed up dir while maintaining disabled CoW - [[ -d "${_orig_dir}"_old ]] \ - && find "${_orig_dir}"_old -mindepth 1 -maxdepth 1 -exec cp -R '{}' "$1" \; - - # set ownership on re-made dir - chown -R $3:$4 "$1" - - # purge backed up dir - [[ -d "${_orig_dir}"_old ]] && rm -rf "${_orig_dir}"_old -} - -_disable_cow() { - _chattrify "$1" "700" "$_bc_user" "$_bc_group" -} - - read -d '' bitcoin <<'EOF' ######################################################################## ######################################################################## |