From fbdfd9b49ba92775f6dfbd6f2cfa3e7c5348bd1f Mon Sep 17 00:00:00 2001
From: luiz <luiz@ohanar.com>
Date: Sat, 14 May 2022 15:19:42 -0400
Subject: [PATCH] using device mapper name for systemd unit instead

---
 scripts/beesd.in          | 16 +++++++---------
 scripts/beesd@.service.in |  5 +++--
 2 files changed, 10 insertions(+), 11 deletions(-)
 mode change 100755 => 100644 scripts/beesd.in

diff --git a/scripts/beesd.in b/scripts/beesd.in
old mode 100755
new mode 100644
index b1f03887..1202cbe5
--- a/scripts/beesd.in
+++ b/scripts/beesd.in
@@ -19,12 +19,6 @@ readonly bees_bin=$(realpath @LIBEXEC_PREFIX@/bees)
 
 command -v "$bees_bin" &> /dev/null || ERRO "Missing 'bees' agent"
 
-uuid_valid(){
-    if uuidparse -n -o VARIANT $1 | grep -i -q invalid; then
-        false
-    fi
-}
-
 help(){
     echo "Usage: beesd [options] <btrfs_uuid>"
     echo "- - -"
@@ -62,9 +56,13 @@ for arg in "${ARGUMENTS[@]}"; do
 done
 
 for arg in "${NOT_SUPPORTED_ARGS[@]}"; do
-    if uuid_valid $arg; then
-        [ ! -z "$UUID" ] && help
-        UUID=$arg
+    if [ ! -z "$(blkid --uuid $arg -o value | head -1)" ]; then
+        UUID="$arg"
+        INFO "Using UUID $arg"
+    fi
+    if [ ! -z "$(blkid /dev/mapper/$arg -o value | head -1)" ]; then
+        UUID="$(blkid /dev/mapper/$arg -o value | head -1)"
+        INFO "Found $UUID for $arg"
     fi
 done
 
diff --git a/scripts/beesd@.service.in b/scripts/beesd@.service.in
index e4bab3ca..16248892 100644
--- a/scripts/beesd@.service.in
+++ b/scripts/beesd@.service.in
@@ -1,7 +1,8 @@
 [Unit]
 Description=Bees (%i)
 Documentation=https://github.com/Zygo/bees
-After=sysinit.target
+#After=sysinit.target
+After=local-fs.target
 
 [Service]
 Type=simple
@@ -56,4 +57,4 @@ AmbientCapabilities=CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SYS_ADMI
 NoNewPrivileges=true
 
 [Install]
-WantedBy=basic.target
+WantedBy=multi-user.target