From 5c5ca001eaad2ca557fa93e23798d40edaa989eb Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 30 Mar 2020 22:07:50 +0200
Subject: bareos: 19.2.6-10 -> 19.2.6-11

---
 bareos/PKGBUILD                          |  4 +--
 bareos/check-if-bareos-backup-is-running | 49 +++++---------------------------
 2 files changed, 9 insertions(+), 44 deletions(-)

(limited to 'bareos')

diff --git a/bareos/PKGBUILD b/bareos/PKGBUILD
index 5f0fdc5b..60d4bdb8 100644
--- a/bareos/PKGBUILD
+++ b/bareos/PKGBUILD
@@ -24,7 +24,7 @@ pkgname=("${pkgbase}-common"
          "${pkgbase}-storage-python-plugin")
 
 pkgver=19.2.6
-pkgrel=10
+pkgrel=11
 arch=(x86_64 i486 i686 pentium4 armv6h armv7h aarch64)
 groups=('bareos')
 pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
@@ -42,7 +42,7 @@ source=("$pkgbase-$pkgver.tar.gz::https://github.com/$pkgbase/$pkgbase/archive/R
 'check-if-bareos-backup-is-running')
 sha512sums=('e91f9470b206a9f8e707fb8cb72497e240b85cdb94b5ef1d6262db7b71ba05ba8a4909aeb66df8cf86f6d0c70d35207ed7e865a202e7552cae7d410d04259137'
             '724ca4e04ff4dfb3e56890a06ffb777cac8e1aeafb6142a347fa542aedcdf6604b280f2d55da3c3d7bbcf996cdd0f6184ca324e9195f3f4db090b17337f1df3a'
-            'f3ad1a3bde98b6bd89626938a6ee23f2e8f888fabde78718a84a91b930a4d466ebf25b02d0cd1480293a41a15170523eab1d692401eb4531bcb345fda07a2bc9')
+            '995e642c8cade256c3c1df0df029c7033dda3d7f716349ee825558841159e7afb52a7897f9ba0fa1ca62f1f3e759735cba5c823026581ad50c220d187a2f9b66')
 
 prepare() {
   cd "${srcdir}/${pkgbase}-Release-${pkgver}"
diff --git a/bareos/check-if-bareos-backup-is-running b/bareos/check-if-bareos-backup-is-running
index e638869d..ea7cc3af 100755
--- a/bareos/check-if-bareos-backup-is-running
+++ b/bareos/check-if-bareos-backup-is-running
@@ -5,46 +5,11 @@ if [ $# -ne 0 ]; then
   exit 2
 fi
 
-bareos_pid=$(
-  pgrep -xf '(.*/)?bareos-fd' \
-  | head -n1
-)
-
-if [ -z "${bareos_pid}" ]; then
-  >&2 echo 'check-if-bareos-backup-is-running: cannot find running bareos-fd'
-  exit 2
-fi
-
-if ! grep -qxF bareos-fd "/proc/${bareos_pid}/comm"; then
-  >&2 echo 'check-if-bareos-backup-is-running: cannot find running bareos-fd'
-  exit 2
+if awk '{print $3}' /proc/net/tcp \
+| cut -d: -f2 \
+| grep -qxiF '238F'; then
+  >&2 echo 'bareos-fd is not connected to bareos-sd'
+else
+  >&2 echo 'bareos-fd is connected to bareos-sd'
+  exit 1
 fi
-
-if [ $(whoami) != 'root' ]; then
-  >&2 echo 'check-if-bareos-backup-is-running: must be run as root'
-  exit 2
-fi
-
-time_out=$((
-  $(date +%s)+30
-))
-was=$(
-  sed '
-    s/^read_bytes: //
-    t
-    d
-  ' "/proc/${bareos_pid}/io"
-)
-while [ $(date +%s) -le ${time_out} ]; do
-  sleep 1
-  if sed '
-    s/^read_bytes: //
-    t
-    d
-  ' "/proc/${bareos_pid}/io" \
-  | grep -qvxF "${was}"; then
-    >&2 echo 'bareos-fd is reading'
-    exit 1
-  fi
-done
->&2 echo 'bareos-fd is not reading'
-- 
cgit v1.2.3-54-g00ecf