var directory

This commit is contained in:
Bob Mottram 2015-09-21 20:30:45 +01:00
parent 259c196918
commit 5cd6989e59
1 changed files with 2 additions and 0 deletions

View File

@ -2903,6 +2903,7 @@ function restore_database {
echo " mkdir /root/temp${1}" >> /usr/bin/$RESTORE_SCRIPT_NAME echo " mkdir /root/temp${1}" >> /usr/bin/$RESTORE_SCRIPT_NAME
echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
restore_directory_from_usb "/root/temp${1}" "${1}" restore_directory_from_usb "/root/temp${1}" "${1}"
RESTORE_SUBDIR='var'
if [[ $BACKUP_TYPE != 'obnam' ]]; then if [[ $BACKUP_TYPE != 'obnam' ]]; then
RESTORE_SUBDIR="usb/backup/${1}" RESTORE_SUBDIR="usb/backup/${1}"
fi fi
@ -4249,6 +4250,7 @@ function restore_database_from_friend {
echo " rm -rf /root/temp${1}data" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME echo " rm -rf /root/temp${1}data" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
echo " echo \"Restoring ${1} installation\"" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME echo " echo \"Restoring ${1} installation\"" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
restore_directory_from_friend /root/temp${1} ${1} restore_directory_from_friend /root/temp${1} ${1}
RESTORE_SUBDIR='var'
if [[ $BACKUP_TYPE != 'obnam' ]]; then if [[ $BACKUP_TYPE != 'obnam' ]]; then
RESTORE_SUBDIR="remoterestore/backup/${1}" RESTORE_SUBDIR="remoterestore/backup/${1}"
fi fi