aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/beam/s3.sh17
-rw-r--r--restore.in2
-rw-r--r--s3.in2
3 files changed, 14 insertions, 7 deletions
diff --git a/lib/beam/s3.sh b/lib/beam/s3.sh
index 39416d7..a89220d 100644
--- a/lib/beam/s3.sh
+++ b/lib/beam/s3.sh
@@ -81,9 +81,16 @@ s3_mount() {
s3_unmount()
{
- for id in s3 backer
- do
- mpoint=$(s3_getmpoint $id)
- test -n "$mpoint" && $dry_run umount $mpoint
- done
+ if test -- "$1" = "--force"; do
+ for id in s3 backer
+ do
+ mpoint=$(s3_getmpoint $id)
+ test -n "$mpoint" && $dry_run umount $mpoint
+ done
+ else
+ for mpoint in $umount_list
+ do
+ test -n "$mpoint" && $dry_run umount $mpoint
+ done
+ fi
}
diff --git a/restore.in b/restore.in
index e9d730d..16a5430 100644
--- a/restore.in
+++ b/restore.in
@@ -38,7 +38,7 @@ confirm=1
getyn() {
echo -n "$0:" $* " [Y/n]? "
- read
+ read REPLY
case $REPLY in
''|y*|Y*) REPLY=y;;
*) REPLY=n;;
diff --git a/s3.in b/s3.in
index ab46017..e4d838f 100644
--- a/s3.in
+++ b/s3.in
@@ -70,7 +70,7 @@ mount)
s3_mount
echo "$backup_bucket_name mounted under $backup_mp_s3";;
umount|unmount)
- s3_unmount;;
+ s3_unmount --force;;
status)
for id in s3 backer
do

Return to:

Send suggestions and report system problems to the System administrator.