From 7bd4edeebbf00d5a9e526f8031186926205bdbb3 Mon Sep 17 00:00:00 2001 From: "root@eldersoftheinternet /dev/pts/25 141.14.28.170" Date: Tue, 19 Apr 2016 16:41:47 +0200 Subject: [PATCH 1/2] clusterd: unter die knute des bee --- clusterd/Makefile | 3 ++- clusterd/mkbee.sh | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100755 clusterd/mkbee.sh diff --git a/clusterd/Makefile b/clusterd/Makefile index e130d3a..33a1fee 100644 --- a/clusterd/Makefile +++ b/clusterd/Makefile @@ -8,7 +8,8 @@ all: install: clusterd clusterd.service install -d ${DESTDIR}${SBINDIR} install -m 755 clusterd ${DESTDIR}${SBINDIR}/clusterd + install -d ${DESTDIR}/etc/systemd/system/ install -m 644 clusterd.service ${DESTDIR}/etc/systemd/system/clusterd.service -restart: install +restart: systemctl restart clusterd.service diff --git a/clusterd/mkbee.sh b/clusterd/mkbee.sh new file mode 100755 index 0000000..dab3a2e --- /dev/null +++ b/clusterd/mkbee.sh @@ -0,0 +1,8 @@ +#!/bin/bash +VERSION=`grep -Po "(?<=Revision:\s)(\S+)" clusterd` +PACKAGE=clusterd-${VERSION} +DOWNLOADS=/src/mariux/beeroot/downloads +cd .. +tar zcvf ${DOWNLOADS}/${PACKAGE}.tgz clusterd +bee init ${DOWNLOADS}/${PACKAGE}.tgz -f +./${PACKAGE}-0.bee -c From ddc8cef24d9986e9398e628647aa039973c84cb3 Mon Sep 17 00:00:00 2001 From: "AUTHOR root@afk /dev/pts/33 141.14.30.12" Date: Wed, 20 Apr 2016 10:19:26 +0200 Subject: [PATCH 2/2] clusterd: nach /usr/sbin installieren aber in /sbin aufrufen is nix gut --- clusterd/clusterd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clusterd/clusterd b/clusterd/clusterd index e32da2a..3a8d0d0 100755 --- a/clusterd/clusterd +++ b/clusterd/clusterd @@ -751,7 +751,7 @@ sub udp_rx_restart { if (defined $pid && $pid==0) { my $pid2=fork; if (defined $pid2 && $pid==0) { - exec '/sbin/clusterd','--kill','--daemon'; + exec '/usr/sbin/clusterd','--kill','--daemon'; die "exec failed: $!\n"; } }