backup/backup-rcopy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some errors determin backup device.

Browse Source
This commit is contained in:
Christoph 2023-01-14 16:46:14 +01:00
parent 58d1db64b9
commit e66c1e0479
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/rcopy.conf.sample
View File

@ -89,13 +89,13 @@ if $crypto_backup_device ; then
backup_raw_partition=$_backup_partition backup_raw_partition=$_backup_partition
backup_partition="/dev/mapper/${backup_partition_name}" backup_partition="/dev/mapper/${backup_partition_name}"
elif $extern_usb_disk || $extern_sata_disk || intern_disk ; then elif $extern_usb_disk || $extern_sata_disk || $intern_disk ; then
## - In case of unencrypted (and labeled) extern backup disc ## - In case of unencrypted (and labeled) extern backup disc
## - ## -
if [ -d "/dev/disk/by-label" ]; then if [ -d "/dev/disk/by-label" ]; then
backup_partition=$(realpath /dev/disk/by-label/`ls /dev/disk/by-label | grep $base_label_name`) backup_partition=$(realpath /dev/disk/by-label/`ls /dev/disk/by-label | grep -i $base_label_name`)
[[ "X" != "X$backup_partition" ]] && _found=true [[ "X${backup_partition}" != "X$(realpath /dev/disk/by-label/)" ]] && _found=true
fi fi
## - Otherwise, assuming the backup disc is the alphabetic last attached device ## - Otherwise, assuming the backup disc is the alphabetic last attached device

6
rcopy.sh
View File

@ -165,12 +165,12 @@ if $extern_usb_disk || $extern_sata_disk || $intern_disk ; then
elif ! $(df -h | grep $backup_partition | grep -q $backup_mountpoint 2> /dev/null) ; then elif ! $(df -h | grep $backup_partition | grep -q $backup_mountpoint 2> /dev/null) ; then
msg="[ Warning ]: Backup Partition is mounted, but mount point differs from script defined one ($backup_mountpoint)." msg="[ Warning ]: Backup Partition '${backup_partition}' is mounted, but mount point differs from script defined one ($backup_mountpoint)."
msg="$msg\n Try to unmount partitionn and mount it again.." msg="$msg\n Try to unmount partitionn and mount it again.."
if $MANUAL ; then if $MANUAL ; then
echo -e "\n$msg\n" echo -e "\n$msg\n"
fi fi
echolog "\n[ Warning ]: Backup Partition is mounted, but mount point differs from script defined one echolog "\n[ Warning ]: Backup Partition \033[1m${backup_partition}\033[mis mounted, but mount point differs from script defined one
which is '$backup_mountpoint'.\n\n Try to unmount partition and mount it again.." which is '$backup_mountpoint'.\n\n Try to unmount partition and mount it again.."
$umount $backup_partition > /dev/null 2>&1 $umount $backup_partition > /dev/null 2>&1
@ -211,7 +211,7 @@ if $extern_usb_disk || $extern_sata_disk || $intern_disk ; then
elif ! $(df -h | grep $backup_partition | grep -q $backup_mountpoint 2> /dev/null) ; then elif ! $(df -h | grep $backup_partition | grep -q $backup_mountpoint 2> /dev/null) ; then
msg="[ Error ]: Backup Partition is mounted, but mount point differs from script defined one ($backup_mountpoint)." msg="[ Error ]: Backup Partition '${backup_partition}' is mounted, but mount point differs from script defined one ($backup_mountpoint)."
if $MANUAL ; then if $MANUAL ; then
echo -e "\n$msg\n" echo -e "\n$msg\n"
else else