Bugfixes

* lib/beam/s3.sh (s3_unmount): Implement --force option.
Unless it is given, unmount only mount points from $umount_list.
* s3.in: Pass --force option to s3_unmount.
* restore.in (getyn): Fix a bashism.

1 files changed, 12 insertions, 5 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      
 }