summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Bidulock2020-12-08 15:35:41 -0700
committerBrian Bidulock2020-12-08 15:35:41 -0700
commit4a0122cba45c79da2d26d3438086f6c02ee37fb8 (patch)
tree346e8f25ae3fc2c67646bebfefae01d74aa1c825
parent5f52d878c928ec65b3c11df141e086d7a07ec09a (diff)
downloadaur-4a0122cba45c79da2d26d3438086f6c02ee37fb8.tar.gz
uppkg
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD12
-rw-r--r--pacemaker.install14
3 files changed, 10 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1230559034ed..a5a72a2f9a55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
pkgbase = pacemaker-git
pkgdesc = advanced, scalable high-availability cluster resource manager
- pkgver = 2.0.4.r0.g2deceaa3a
+ pkgver = 2.0.5.r0.gba59be712
pkgrel = 1
url = https://github.com/ClusterLabs/pacemaker/
- install = pacemaker.install
arch = i686
arch = x86_64
license = GPL2
@@ -28,7 +27,7 @@ pkgbase = pacemaker-git
optdepends = pdsh: for use with some tools
optdepends = crmsh-git: for use with crm_report
optdepends = booth-git: for geo-clustering
- provides = pacemaker
+ provides = pacemaker=2.0.5-1
conflicts = pacemaker
source = pacemaker-git::git+https://github.com/ClusterLabs/pacemaker.git#branch=2.0
source = crm_report.in
diff --git a/PKGBUILD b/PKGBUILD
index ad13b283b095..dc28dc4d4825 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=pacemaker-git
_pkgname=pacemaker
-pkgver=2.0.4.r0.g2deceaa3a
+pkgver=2.0.5.r0.gba59be712
pkgrel=1
pkgdesc="advanced, scalable high-availability cluster resource manager"
arch=('i686' 'x86_64')
@@ -19,9 +19,8 @@ optdepends=('pssh: for use with some tools'
'pdsh: for use with some tools'
'crmsh-git: for use with crm_report'
'booth-git: for geo-clustering')
-provides=(${_pkgname})
-conflicts=(${_pkgname})
-install=${_pkgname}.install
+provides=("${_pkgname}=${pkgver%%.r*}-${pkgrel}")
+conflicts=("${_pkgname}")
source=("$pkgname::git+https://github.com/ClusterLabs/${_pkgname}.git#branch=2.0"
'crm_report.in')
md5sums=('SKIP'
@@ -79,6 +78,11 @@ package() {
d /var/lib/pacemaker/cores 0770 hacluster haclient
d /var/lib/pacemaker/pengine 0770 hacluster haclient
EOF
+ install -Dm644 /dev/null "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+ cat>"$pkgdir/usr/lib/sysusers.d/$pkgname.conf"<<-EOF
+ g haclient 189
+ u hacluster 189:189 "cluster user" / /sbin/nologin
+ EOF
rm -fr "$pkgdir/var"
chmod a+x "$pkgdir/usr/share/pacemaker/tests/cts/CTSlab.py"
find "$pkgdir" -name '*.xml' -type f -print0 | xargs -0 chmod a-x
diff --git a/pacemaker.install b/pacemaker.install
deleted file mode 100644
index adf039e5698d..000000000000
--- a/pacemaker.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install(){ :
- usr/bin/getent group haclient >/dev/null || usr/bin/groupadd -r haclient -g 189
- usr/bin/getent passwd hacluster >/dev/null || usr/bin/useradd -r -g 189 -u 189 -s /sbin/nologin -c "cluster user" -d / hacluster
-}
-
-post_upgrade(){ :
-}
-
-post_remove(){ :
- usr/bin/getent group haclient >/dev/null && usr/bin/groupdel -f haclient
- usr/bin/getent passwd hacluster >/dev/null && usr/bin/userdel hacluster
-# usr/bin/rm -fr var/lib/pacemaker
-}
-