| 1 |
michel |
1.1 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm |
| 2 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2021-06-21 13:25:10.000000000 +0400 |
| 3 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2021-12-26 22:47:52.000000000 +0400 |
| 4 |
|
|
@@ -279,9 +279,7 @@ |
| 5 |
|
|
|
| 6 |
|
|
$res = ''; |
| 7 |
|
|
if ( ! $result ) { |
| 8 |
|
|
- $res = $c->workstnVerify(); # list returned |
| 9 |
|
|
$bac_datas{function} = $function; |
| 10 |
|
|
- $bac_datas{files_list} = $res; |
| 11 |
|
|
} |
| 12 |
|
|
|
| 13 |
|
|
} |
| 14 |
|
|
@@ -1000,6 +998,7 @@ |
| 15 |
|
|
exit(0); |
| 16 |
|
|
} |
| 17 |
|
|
} |
| 18 |
|
|
+ $error_message .= $c->bunmount($mntdir,$VFSType); |
| 19 |
|
|
return $out; |
| 20 |
|
|
} |
| 21 |
|
|
|
| 22 |
|
|
@@ -1155,6 +1154,7 @@ |
| 23 |
|
|
|
| 24 |
|
|
$rdb->reload; |
| 25 |
|
|
|
| 26 |
|
|
+ $error_message .= $c->bunmount($mntdir,$VFSType); |
| 27 |
|
|
return '#OK#' . $out; |
| 28 |
|
|
} |
| 29 |
|
|
|
| 30 |
|
|
@@ -1685,6 +1685,7 @@ |
| 31 |
|
|
push @list, [ "$blabels{$labkey}" => "$labkey" ]; |
| 32 |
|
|
} |
| 33 |
|
|
|
| 34 |
|
|
+ $error_message .= $c->bunmount($mntdir,$VFSType); |
| 35 |
|
|
return \@list; |
| 36 |
|
|
} |
| 37 |
|
|
|
| 38 |
|
|
@@ -1755,6 +1756,8 @@ |
| 39 |
|
|
push @list, [ $bkname[$j] => "$bknum[$j]" ]; |
| 40 |
|
|
$j++ |
| 41 |
|
|
} |
| 42 |
|
|
+ |
| 43 |
|
|
+ $error_message .= $c->bunmount($mntdir,$VFSType); |
| 44 |
|
|
return \@list; |
| 45 |
|
|
} |
| 46 |
|
|
|
| 47 |
|
|
@@ -1831,6 +1834,7 @@ |
| 48 |
|
|
exit(0); |
| 49 |
|
|
} |
| 50 |
|
|
|
| 51 |
|
|
+ $error_message .= $c->bunmount($mntdir,$VFSType); |
| 52 |
|
|
return \@flabels; |
| 53 |
|
|
} |
| 54 |
|
|
|
| 55 |
|
|
@@ -2123,4 +2127,3 @@ |
| 56 |
|
|
|
| 57 |
|
|
|
| 58 |
|
|
1; |
| 59 |
|
|
- |
| 60 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr.pm |
| 61 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr.pm 2021-12-27 20:59:21.000000000 +0400 |
| 62 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr.pm 2021-12-27 21:16:40.975000000 +0400 |
| 63 |
|
|
@@ -23,7 +23,7 @@ |
| 64 |
|
|
use SrvMngr::Model::Main; |
| 65 |
|
|
|
| 66 |
|
|
|
| 67 |
|
|
-our $VERSION = '1.403'; |
| 68 |
|
|
+our $VERSION = '1.410'; |
| 69 |
|
|
$VERSION = eval $VERSION; |
| 70 |
|
|
|
| 71 |
|
|
use Exporter 'import'; |
| 72 |
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/back_workstn_verify1.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/back_workstn_verify1.html.ep |
| 73 |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/back_workstn_verify1.html.ep 2021-12-27 20:59:21.000000000 +0400 |
| 74 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/back_workstn_verify1.html.ep 2021-12-26 22:40:36.000000000 +0400 |
| 75 |
|
|
@@ -21,7 +21,7 @@ |
| 76 |
|
|
<h2><%= l 'bac_VERIFY_WORKSTN_BACKUP_FILE' %></h2> |
| 77 |
|
|
|
| 78 |
|
|
<br> |
| 79 |
|
|
- %= $c->render_to_string(inline => $bac_datas->{files_list}) |
| 80 |
|
|
+ %= $c->render_to_string(inline => $c->workstnVerify()) |
| 81 |
|
|
<br> |
| 82 |
|
|
|
| 83 |
|
|
%= form_for '/backupd' => (method => 'POST') => begin |
Parent Directory
| 
Revision Log
| 
Revision Graph
