Skip to content

Commit 6c2f4e3

Browse files
authored
Merge pull request hestiacp#8 from serghey-rodin/master
update from master
2 parents 0970485 + 73a0b3f commit 6c2f4e3

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

bin/v-backup-user

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,12 @@ while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do
6868
(( ++i))
6969
done
7070

71+
if [ -z "$BACKUP_TEMP" ]; then
72+
BACKUP_TEMP=$BACKUP
73+
fi
74+
7175
# Creating temporary directory
72-
tmpdir=$(mktemp -p $BACKUP -d)
76+
tmpdir=$(mktemp -p $BACKUP_TEMP -d)
7377

7478
if [ "$?" -ne 0 ]; then
7579
echo "Can't create tmp dir $tmpdir" |$SENDMAIL -s "$subj" $email $notify

bin/v-restore-user

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,12 @@ while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do
229229
(( ++i))
230230
done
231231

232+
if [ -z "$BACKUP_TEMP" ]; then
233+
BACKUP_TEMP=$BACKUP
234+
fi
235+
232236
# Creating temporary directory
233-
tmpdir=$(mktemp -p $BACKUP -d)
237+
tmpdir=$(mktemp -p $BACKUP_TEMP -d)
234238
if [ "$?" -ne 0 ]; then
235239
echo "Can't create tmp dir $tmpdir" |$SENDMAIL -s "$subj" $email $notify
236240
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe

0 commit comments

Comments
 (0)