From af53a6b2ec38ea17b11841413b9c4a91f26dd27c Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Mon, 2 Mar 2020 14:45:41 +0100
Subject: [PATCH] evomaintenance: upstream release 0.6.2

---
 CHANGELOG.md                           |  2 +-
 evomaintenance/files/evomaintenance.sh | 31 +++++++++++++++++++-------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 541bd5a3..e4f9f2f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,7 +52,7 @@ The **patch** part changes incrementally at each release.
 * evocheck: cron jobs execute in verbose
 * evolinux-base: use "evolinux_internal_group" for SSH authentication
 * evomaintenance: Turn on API by default (instead of DB)
-* evomaintenance: upstream version 0.6.0
+* evomaintenance: upstream version 0.6.2
 * evomaintenance: install PG dependencies only when needed
 * listupgrade: update from upstream
 * lxc-php: refactor tasks for better maintainability
diff --git a/evomaintenance/files/evomaintenance.sh b/evomaintenance/files/evomaintenance.sh
index a4593942..0270c603 100644
--- a/evomaintenance/files/evomaintenance.sh
+++ b/evomaintenance/files/evomaintenance.sh
@@ -7,7 +7,7 @@
 # Copyright 2007-2019 Evolix <info@evolix.fr>, Gregory Colpart <reg@evolix.fr>,
 #                     Jérémy Lecour <jlecour@evolix.fr> and others.
 
-VERSION="0.6.0"
+VERSION="0.6.2"
 
 show_version() {
     cat <<END
@@ -169,16 +169,31 @@ print_session_data() {
 }
 
 is_repository_readonly() {
-    mountpoint=$(stat -c '%m' $1)
-    findmnt ${mountpoint} --noheadings --output OPTIONS | grep -q -E "\bro\b"
+    if [ "$(get_system)" = "OpenBSD" ]; then
+        partition=$(stat -f '%Sd' $1)
+        mount | grep ${partition} | grep -q "read-only"
+    else
+        mountpoint=$(stat -c '%m' $1)
+        findmnt ${mountpoint} --noheadings --output OPTIONS -O ro
+    fi
 }
 remount_repository_readwrite() {
-    mountpoint=$(stat -c '%m' $1)
-    mount -o remount,rw ${mountpoint}
+    if [ "$(get_system)" = "OpenBSD" ]; then
+        partition=$(stat -f '%Sd' $1)
+        mount -u -w /dev/${partition} 2>/dev/null
+    else
+        mountpoint=$(stat -c '%m' $1)
+        mount -o remount,rw ${mountpoint}
+    fi
 }
 remount_repository_readonly() {
-    mountpoint=$(stat -c '%m' $1)
-    mount -o remount,ro ${mountpoint} 2>/dev/null
+    if [ "$(get_system)" = "OpenBSD" ]; then
+        partition=$(stat -f '%Sd' $1)
+        mount -u -r /dev/${partition} 2>/dev/null
+    else
+        mountpoint=$(stat -c '%m' $1)
+        mount -o remount,ro ${mountpoint} 2>/dev/null
+    fi
 }
 
 hook_commit() {
@@ -532,7 +547,7 @@ if [ "${INTERACTIVE}" = "1" ] && [ "${EVOCHECK}" = "1" ]; then
     get_evocheck
 fi
 if [ -n "${GIT_STATUSES}" ] && [ "${INTERACTIVE}" = "1" ]; then
-    printf "/!\ There are some uncommited changes.\n%s\n\n" "${GIT_STATUSES}"
+    printf "/!\\\ There are some uncommited changes.\n%s\n\n" "${GIT_STATUSES}"
 fi
 
 if [ -z "${MESSAGE}" ]; then