From a8995cc284b3daefaa614f10ac2387810d38d0c7 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 6 Mar 2015 10:23:42 +0100
Subject: [PATCH] add umount_backup_dir to server/lib/classes/system.inc.php
---
server/lib/classes/system.inc.php | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 75dc73deb9..98fc51fdef 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -1808,7 +1808,7 @@ class system{
fileowner($mount_cmd) === 0
) {
if (!$this->is_mounted($backup_dir)){
- exec($backup_dir_mount_cmd);
+ exec($mount_cmd);
sleep(1);
if (!$this->is_mounted($backup_dir)) $mounted = false;
}
@@ -1816,7 +1816,21 @@ class system{
return $mounted;
}
-
+
+ function umount_backup_dir($backup_dir, $mount_cmd = '/usr/local/ispconfig/server/scripts/backup_dir_umount.sh'){
+ if ( is_file($mount_cmd) &&
+ is_executable($mount_cmd) &&
+ fileowner($mount_cmd) === 0
+ ) {
+ if ($this->is_mounted($backup_dir)){
+ exec($mount_cmd);
+ sleep(1);
+ }
+ }
+
+ return $this->is_mounted($backup_dir) == 0 ? true : false;
+ }
+
function getinitcommand($servicename, $action, $init_script_directory = ''){
global $conf;
// upstart
--
GitLab