diff options
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | manual/en/060-backing-up.mdwn | 21 | ||||
| -rw-r--r-- | obnam.1.in | 10 |
3 files changed, 19 insertions, 20 deletions
@@ -8,6 +8,14 @@ development, called `green-albatross`. It is **NOT** meant for real use. It is likely to change in incompatible ways without warning. Do not use it unless you're willing to lose your backup. +Version 1.20, released UNRELEASED +--------------------------------- + +Bug fixes: + +* The manual and manual page used to claim you could break only the + locks for one client. This was not true. The manuals has been fixed. + Version 1.19.1, released 2016-01-30 --------------------------------- diff --git a/manual/en/060-backing-up.mdwn b/manual/en/060-backing-up.mdwn index 5c5c4538..ee28d6e2 100644 --- a/manual/en/060-backing-up.mdwn +++ b/manual/en/060-backing-up.mdwn @@ -451,27 +451,18 @@ happen if Obnam is interrupted by the user before it's finished. The Obnam command `force-lock` deals with this situation. It is dangerous, though. If you force open a lock that is in active use by -a running Obnam instance, there will likely to be some stepping of -toes. The result may, in extreme cases, even result in repository -corruption. So be careful. +any running Obnam instance, on any client machine using that +repository, there will likely to be some stepping of toes. The result +may, in extreme cases, even result in repository corruption. So be +careful. If you've decided you can safely do it, this is an example of how to do it: obnam -r /media/backups/tomjon-repo force-lock -Note that some of the locks are per-client, to prevent you from -accidentally running Obnam twice for the same client, which would -result in standing on your own toes: kind of impressive, but -uncomfortable and not recommended. - -If you need to force open a lock for specific client, you can specify -the client name explicitly: - - obnam --client-name magrat \ - -r /media/backups/tomjon-repo force-lock - -(Long line broken to two for typographical reasons.) +It is not currently possibly to only break locks related to one +client. Consistency of live data ------------------------ @@ -103,11 +103,11 @@ all file contents still exists in the backup repository. It may take quite a long time to run. .IP \(bu .B force\-lock -removes a lock file for a client in the repository. -You should only force a lock if you are sure no-one is accessing that -client's data in the repository. -A dangling lock might happen, for example, if obnam loses its network -connection to the backup repository. +removes lock files for aall clients in the repository. +You should only force a lock if you are sure no client is accessing +the repository. +A dangling lock might happen, for example, +if "obnam backup" loses its network connection to the backup repository. .IP \(bu .B client\-keys lists the encryption key associated with each client. |