borgbackup 2.0.0b13__tar.gz → 2.0.0b15__tar.gz

{borgbackup-2.0.0b13 → borgbackup-2.0.0b15}/Brewfile

@@ -1,4 +1,4 @@
-brew 'pkg-config'
+brew 'pkgconf'
 brew 'zstd'
 brew 'lz4'
 brew 'xxhash'

{borgbackup-2.0.0b13 → borgbackup-2.0.0b15}/CHANGES.rst

@@ -50,6 +50,16 @@ Compatibility notes:
     within the same series of archives to make borg work more efficiently.
     the name now identifies a series of archive, to identify a single archive
     please use aid:<archive-hash-prefix>, e.g.: borg delete aid:d34db33f
+  - in case you do NOT want to adopt the "series name" way of naming archives
+    (like "myarchive") as we recommend, but keep using always-changing names
+    (like "myserver-myarchive-20241231"), you can do that, but then you must
+    make use of BORG_FILES_CACHE_SUFFIX and either set it to a constant suffix
+    (like "all") or to a unique suffix per archive series (like
+    "myserver-myarchive") so that borg can find the correct files cache.
+    For the "all" variant, you must also set BORG_FILES_CACHE_TTL to a value
+    greater than the count of different archives series you write to that repo.
+    Usually borg uses a different files cache suffix per archive (series) name
+    and defaults to BORG_FILES_CACHE_TTL=2 because that is sufficient for that.
   - the archive id is always given separately from the repository
     (differently than with borg 1.x you must not give repo::archive).
   - the series name or archive id is either given as a positional parameter,
@@ -97,6 +107,8 @@ Compatibility notes:
   - removed --save-space option (does not change behaviour)
 - removed --bypass-lock option
 - removed borg config command (only worked locally anyway)
+- compact command now requires access to the borg key if the repo is encrypted
+  or authenticated
 - using --list together with --progress is now disallowed (except with --log-json), #7219
 - the --glob-archives option was renamed to --match-archives (the short option
   name -a is unchanged) and extended to support different pattern styles:
@@ -132,7 +144,7 @@ Compatibility notes:
 Change Log 2.x
 ==============
 
-Version 2.0.0b13 (2024-10-31)
+Version 2.0.0b15 (2025-04-22)
 -----------------------------
 
 Please note:
@@ -144,6 +156,115 @@ above.
 
 New features:
 
+- compact: without --stats, it will be faster by using the cached chunks index.
+  with --stats it will be as slow as before, listing all repo objs.
+- compact: support --dry-run (do nothing), #8300
+- extract: --dry-run now displays +/- status flags (included/excluded), #8564
+- allow timespan to be specified with common time units, #8624
+- enhance passphrase handling, #8496.
+
+  Setting `BORG_DEBUG_PASSPHRASE=YES` enables passphrase debug logging to
+  stderr, showing passphrase, hex utf-8 byte sequence and related env vars if
+  a wrong passphrase was encountered.
+
+  Setting `BORG_DISPLAY_PASSPHRASE=YES` now always shows passphrase and its hex
+  utf-8 byte sequence.
+- add {unixtime} placeholder, #8522
+- implement padme chunk size obfuscation (SPEC 250), #8705
+- macOS: retrieve birthtime in nanosecond precision via system call, #8724
+
+Bug fixes:
+
+- borg exits when assertions are disabled with Python optimizations, #8649
+- yes(): deal with UnicodeDecodeError in input(), #6984
+- fix remote repository exception handling / modern exit codes, #8631
+- freebsd: fix nfs4 acl processing, #8756.
+  This issue only affected borg extract --numeric-ids when processing NFS4
+  ACLs, it didn't affect POSIX ACL processing.
+
+Other changes:
+
+- adapt to and require borghash 0.1.0
+- adapt to and require borgstore 0.2.0 (new s3/b2 backend, fixes/improvements)
+- create: remove --make-parent-dirs option (borgstore now does this automatically), #8619
+- iter_items: decouple item iteration and content data chunks preloading
+- remote: simplify code, add debug logging
+- pyproject.toml: SPDX expression for license, add license-files, #8771
+- Item: remove .chunks_healthy, #8559
+- OpenBSD fixes:
+
+  - support other OpenSSL versions on OpenBSD, #8553
+  - vagrant: fix OpenBSD box, #8506
+  - Filter test output with LibreSSL related warnings on OpenBSD
+- macOS: fix brew's broken pkg-config -> pkgconf transition
+- tests: ignore 'com.apple.provenance' xattr (macOS specific)
+- vagrant updates:
+
+  - use pyinstaller 6.11.1 (also use this in msys2 build scripts)
+  - use python 3.12.10
+  - build binaries with borgstore[sftp], #8574
+- docs:
+
+  - automated backup: append to SYSTEMD_WANTS rather than overwrite, #8641
+  - fix udev rule priority in automated-local.rst, #8639
+  - FAQ: Why backups are slow on a Linux server that is a member of a windows domain? #8636
+  - within a shell, cli options with special characters may require quoting, #8578
+  - update prune documentation for new --keep-within intervals, #8630
+  - borg serve: recommend using a simple shell, #3818
+  - update install docs (requirements, pkgconfig, fuse), #8342
+  - libffi-dev is required for argon2-cffi-bindings
+  - add undelete command to index
+  - borg commands updated with --repo option, #8550
+  - FAQ: add entry about pure-python msgpack warning, #8323
+  - readthedocs theme fixes
+
+    - bring back highlighted content preview in search results.
+    - fix erroneous warning about missing javascript support.
+
+
+Version 2.0.0b14 (2024-11-17)
+-----------------------------
+
+New features:
+
+- delete: now only soft-deletes archives (same for prune)
+- repo-list: --deleted lists deleted archives
+- undelete: undelete soft-deleted archives, #8500
+
+Fixes:
+
+- chunks index cache:
+
+  - enable partial/incremental updates (F_NEW flag).
+  - write chunks index every 10mins, #8503.
+    this makes sure progress is not totally lost when a backup is interrupted.
+  - write to repo/cache/chunks.<HASH> to enable parallel updates.
+- mount: fix check_pending_archive to give correct root dir, #8528
+
+Other changes:
+
+- repo-compress: reduce memory consumption (F_COMPRESS flag)
+- files cache: reduce memory consumption, #5756
+- check: rename --undelete-archives to --find-lost-archives
+- check: rebuild_archives_directory: accelerate by only reading metadata
+- shell completions: adapt zsh for borg 2.0.0b13 - needs more work!
+- chunk index: rename .refcount to .flags, use it for user and system flags.
+- vagrant:
+
+  - add bookworm32 box for 32bit platform testing
+  - fix pythons on freebsd14
+  - simplify openindiana box setup
+- docs:
+
+  - remove --bypass-lock, small changes regarding compression
+  - FAQ: clean up entries regarding SSH settings
+
+
+Version 2.0.0b13 (2024-10-31)
+-----------------------------
+
+New features:
+
 - implement special tags, @PROT tag for protecting archives, #953.
 
   borg won't delete/prune/recreate protected archives.

{borgbackup-2.0.0b13 → borgbackup-2.0.0b15}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2015-2024 The Borg Collective (see AUTHORS file)
+Copyright (C) 2015-2025 The Borg Collective (see AUTHORS file)
 Copyright (C) 2010-2014 Jonas Borgström <jonas@borgstrom.se>
 All rights reserved.
 

{borgbackup-2.0.0b13 → borgbackup-2.0.0b15}/PKG-INFO

@@ -1,10 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: borgbackup
-Version: 2.0.0b13
+Version: 2.0.0b15
 Summary: Deduplicated, encrypted, authenticated and compressed backups
 Author: The Borg Collective (see AUTHORS file)
 Maintainer-email: Thomas Waldmann <tw@waldmann-edv.de>
-License: BSD
+License-Expression: BSD-3-Clause
 Project-URL: Homepage, https://borgbackup.org/
 Project-URL: Bug Tracker, https://github.com/borgbackup/borg/issues
 Project-URL: Documentation, https://borgbackup.readthedocs.io/
@@ -14,7 +14,6 @@ Keywords: backup,borgbackup
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: POSIX :: BSD :: FreeBSD
 Classifier: Operating System :: POSIX :: BSD :: OpenBSD
 Classifier: Operating System :: POSIX :: BSD :: NetBSD
@@ -32,8 +31,8 @@ Classifier: Topic :: System :: Archiving :: Backup
 Requires-Python: >=3.9
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: borghash~=0.0.1
-Requires-Dist: borgstore~=0.1.0
+Requires-Dist: borghash~=0.1.0
+Requires-Dist: borgstore~=0.2.0
 Requires-Dist: msgpack<=1.1.0,>=1.0.3
 Requires-Dist: packaging
 Requires-Dist: platformdirs<5.0.0,>=3.0.0; sys_platform == "darwin"
@@ -44,6 +43,8 @@ Requires-Dist: llfuse>=1.3.8; extra == "llfuse"
 Provides-Extra: pyfuse3
 Requires-Dist: pyfuse3>=3.1.1; extra == "pyfuse3"
 Provides-Extra: nofuse
+Dynamic: description
+Dynamic: license-file
 
 
 What is BorgBackup?

borgbackup-2.0.0b15/docs/_templates/layout.html

@@ -0,0 +1,173 @@
+{%- extends "basic/layout.html" %}
+
+{# Do this so that bootstrap is included before the main css file #}
+{%- block htmltitle %}
+  {% set script_files = script_files + ["_static/myscript.js"] %}
+  <!-- Licensed under the Apache 2.0 License -->
+  <link rel="stylesheet" type="text/css" href="{{ pathto('_static/fonts/open-sans/stylesheet.css', 1) }}" />
+  <!-- Licensed under the SIL Open Font License -->
+  <link rel="stylesheet" type="text/css" href="{{ pathto('_static/fonts/source-serif-pro/source-serif-pro.css', 1) }}" />
+  <link rel="stylesheet" type="text/css" href="{{ pathto('_static/css/bootstrap.min.css', 1) }}" />
+  <link rel="stylesheet" type="text/css" href="{{ pathto('_static/css/bootstrap-theme.min.css', 1) }}" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  {{ super() }}
+{%- endblock %}
+
+{%- block extrahead %}
+  {% if theme_touch_icon %}
+  <link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, 1) }}" />
+  {% endif %}
+  {{ super() }}
+{% endblock %}
+
+{# Displays the URL for the homepage if it's set or the master_doc if it is not #}
+{% macro homepage() -%}
+  {%- if theme_homepage %}
+    {%- if hasdoc(theme_homepage) %}
+      {{ pathto(theme_homepage) }}
+    {%- else %}
+      {{ theme_homepage }}
+    {%- endif %}
+  {%- else %}
+    {{ pathto(master_doc) }}
+  {%- endif %}
+{%- endmacro %}
+
+{# Displays the URL for the tospage if it's set or falls back to homepage macro #}
+{% macro tospage() -%}
+  {%- if theme_tospage %}
+    {%- if hasdoc(theme_tospage) %}
+      {{ pathto(theme_tospage) }}
+    {%- else %}
+      {{ theme_tospage }}
+    {%- endif %}
+  {%- else %}
+    {{ homepage() }}
+  {%- endif %}
+{%- endmacro %}
+
+{# Displays the URL for the projectpage if it's set or falls back to homepage macro #}
+{% macro projectlink() -%}
+  {%- if theme_projectlink %}
+    {%- if hasdoc(theme_projectlink) %}
+      {{ pathto(theme_projectlink) }}
+    {%- else %}
+      {{ theme_projectlink }}
+    {%- endif %}
+  {%- else %}
+    {{ homepage() }}
+  {%- endif %}
+{%- endmacro %}
+
+{# Displays the next and previous links both before and after content #}
+{% macro render_relations() -%}
+  {% if prev or next %}
+  <div class="footer-relations">
+    {% if prev %}
+      <div class="pull-left">
+        <a class="btn btn-default" href="{{ prev.link|e }}" title="{{ _('previous chapter')}} (use the left arrow)">{{ prev.title }}</a>
+      </div>
+    {% endif %}
+    {%- if next and next.title != '&lt;no title&gt;' %}
+      <div class="pull-right">
+        <a class="btn btn-default" href="{{ next.link|e }}" title="{{ _('next chapter')}} (use the right arrow)">{{ next.title }}</a>
+      </div>
+    {%- endif %}
+    </div>
+    <div class="clearer"></div>
+  {% endif %}
+{%- endmacro %}
+
+{%- macro guzzle_sidebar() %}
+  <div id="left-column">
+    <div class="sphinxsidebar">
+      {%- if sidebars != None %}
+        {#- new style sidebar: explicitly include/exclude templates #}
+        {%- for sidebartemplate in sidebars %}
+        {%- include sidebartemplate %}
+        {%- endfor %}
+      {% else %}
+        {% include "logo-text.html" %}
+        {% include "globaltoc.html" %}
+        {% include "searchbox.html" %}
+      {%- endif %}
+    </div>
+  </div>
+{%- endmacro %}
+
+{%- block content %}
+
+  {%- if pagename == 'index' and theme_index_template %}
+    {% include theme_index_template %}
+  {%- else %}
+    <div class="container-wrapper">
+
+      <div id="mobile-toggle">
+        <a href="#"><span class="glyphicon glyphicon-align-justify" aria-hidden="true"></span></a>
+      </div>
+
+      {%- block sidebar1 %}{{ guzzle_sidebar() }}{% endblock %}
+
+      {%- block document_wrapper %}
+        {%- block document %}
+        <div id="right-column">
+          {% block breadcrumbs %}
+          <div role="navigation" aria-label="breadcrumbs navigation">
+            <ol class="breadcrumb">
+              <li><a href="{{ pathto(master_doc) }}">Docs</a></li>
+              {% for doc in parents %}
+                <li><a href="{{ doc.link|e }}">{{ doc.title }}</a></li>
+              {% endfor %}
+              <li>{{ title }}</li>
+            </ol>
+          </div>
+          {% endblock %}
+          <div class="document clearer body" role="main">
+            {% block body %} {% endblock %}
+          </div>
+          {%- block bottom_rel_links %}
+            {{ render_relations() }}
+          {%- endblock %}
+        </div>
+        <div class="clearfix"></div>
+        {%- endblock %}
+      {%- endblock %}
+
+      {%- block comments -%}
+        {% if theme_disqus_comments_shortname %}
+        <div class="container comment-container">
+          {% include "comments.html" %}
+        </div>
+        {% endif %}
+      {%- endblock %}
+    </div>
+  {%- endif %}
+  {%- endblock %}
+
+{%- block footer %}
+<script type="text/javascript">
+  $("#mobile-toggle a").click(function () {
+    $("#left-column").toggle();
+  });
+</script>
+<script type="text/javascript" src="{{ pathto('_static/js/bootstrap.js', 1)}}"></script>
+{%- block footer_wrapper %}
+  <div class="footer">
+    &copy; Copyright {{ copyright }}. Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
+  </div>
+{%- endblock %}
+{%- block ga %}
+  {%- if theme_google_analytics_account %}
+    <script type="text/javascript">
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', '{{ theme_google_analytics_account }}']);
+      _gaq.push(['_trackPageview']);
+      (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
+    </script>
+  {%- endif %}
+{%- endblock %}
+{%- endblock %}

{borgbackup-2.0.0b13 → borgbackup-2.0.0b15}/docs/binaries/00_README.txt

@@ -67,7 +67,10 @@ platforms).
 
 Reporting issues
 ----------------
-If you find issues, please open a ticket on our issue tracker:
+
+Please first check the FAQ and whether a github issue already exists.
+
+If you find a NEW issue, please open a ticket on our issue tracker:
 
 https://github.com/borgbackup/borg/issues/
 

{borgbackup-2.0.0b13 → borgbackup-2.0.0b15}/docs/changes.rst

@@ -50,6 +50,16 @@ Compatibility notes:
     within the same series of archives to make borg work more efficiently.
     the name now identifies a series of archive, to identify a single archive
     please use aid:<archive-hash-prefix>, e.g.: borg delete aid:d34db33f
+  - in case you do NOT want to adopt the "series name" way of naming archives
+    (like "myarchive") as we recommend, but keep using always-changing names
+    (like "myserver-myarchive-20241231"), you can do that, but then you must
+    make use of BORG_FILES_CACHE_SUFFIX and either set it to a constant suffix
+    (like "all") or to a unique suffix per archive series (like
+    "myserver-myarchive") so that borg can find the correct files cache.
+    For the "all" variant, you must also set BORG_FILES_CACHE_TTL to a value
+    greater than the count of different archives series you write to that repo.
+    Usually borg uses a different files cache suffix per archive (series) name
+    and defaults to BORG_FILES_CACHE_TTL=2 because that is sufficient for that.
   - the archive id is always given separately from the repository
     (differently than with borg 1.x you must not give repo::archive).
   - the series name or archive id is either given as a positional parameter,
@@ -97,6 +107,8 @@ Compatibility notes:
   - removed --save-space option (does not change behaviour)
 - removed --bypass-lock option
 - removed borg config command (only worked locally anyway)
+- compact command now requires access to the borg key if the repo is encrypted
+  or authenticated
 - using --list together with --progress is now disallowed (except with --log-json), #7219
 - the --glob-archives option was renamed to --match-archives (the short option
   name -a is unchanged) and extended to support different pattern styles:
@@ -132,7 +144,7 @@ Compatibility notes:
 Change Log 2.x
 ==============
 
-Version 2.0.0b13 (2024-10-31)
+Version 2.0.0b15 (2025-04-22)
 -----------------------------
 
 Please note:
@@ -144,6 +156,115 @@ above.
 
 New features:
 
+- compact: without --stats, it will be faster by using the cached chunks index.
+  with --stats it will be as slow as before, listing all repo objs.
+- compact: support --dry-run (do nothing), #8300
+- extract: --dry-run now displays +/- status flags (included/excluded), #8564
+- allow timespan to be specified with common time units, #8624
+- enhance passphrase handling, #8496.
+
+  Setting `BORG_DEBUG_PASSPHRASE=YES` enables passphrase debug logging to
+  stderr, showing passphrase, hex utf-8 byte sequence and related env vars if
+  a wrong passphrase was encountered.
+
+  Setting `BORG_DISPLAY_PASSPHRASE=YES` now always shows passphrase and its hex
+  utf-8 byte sequence.
+- add {unixtime} placeholder, #8522
+- implement padme chunk size obfuscation (SPEC 250), #8705
+- macOS: retrieve birthtime in nanosecond precision via system call, #8724
+
+Bug fixes:
+
+- borg exits when assertions are disabled with Python optimizations, #8649
+- yes(): deal with UnicodeDecodeError in input(), #6984
+- fix remote repository exception handling / modern exit codes, #8631
+- freebsd: fix nfs4 acl processing, #8756.
+  This issue only affected borg extract --numeric-ids when processing NFS4
+  ACLs, it didn't affect POSIX ACL processing.
+
+Other changes:
+
+- adapt to and require borghash 0.1.0
+- adapt to and require borgstore 0.2.0 (new s3/b2 backend, fixes/improvements)
+- create: remove --make-parent-dirs option (borgstore now does this automatically), #8619
+- iter_items: decouple item iteration and content data chunks preloading
+- remote: simplify code, add debug logging
+- pyproject.toml: SPDX expression for license, add license-files, #8771
+- Item: remove .chunks_healthy, #8559
+- OpenBSD fixes:
+
+  - support other OpenSSL versions on OpenBSD, #8553
+  - vagrant: fix OpenBSD box, #8506
+  - Filter test output with LibreSSL related warnings on OpenBSD
+- macOS: fix brew's broken pkg-config -> pkgconf transition
+- tests: ignore 'com.apple.provenance' xattr (macOS specific)
+- vagrant updates:
+
+  - use pyinstaller 6.11.1 (also use this in msys2 build scripts)
+  - use python 3.12.10
+  - build binaries with borgstore[sftp], #8574
+- docs:
+
+  - automated backup: append to SYSTEMD_WANTS rather than overwrite, #8641
+  - fix udev rule priority in automated-local.rst, #8639
+  - FAQ: Why backups are slow on a Linux server that is a member of a windows domain? #8636
+  - within a shell, cli options with special characters may require quoting, #8578
+  - update prune documentation for new --keep-within intervals, #8630
+  - borg serve: recommend using a simple shell, #3818
+  - update install docs (requirements, pkgconfig, fuse), #8342
+  - libffi-dev is required for argon2-cffi-bindings
+  - add undelete command to index
+  - borg commands updated with --repo option, #8550
+  - FAQ: add entry about pure-python msgpack warning, #8323
+  - readthedocs theme fixes
+
+    - bring back highlighted content preview in search results.
+    - fix erroneous warning about missing javascript support.
+
+
+Version 2.0.0b14 (2024-11-17)
+-----------------------------
+
+New features:
+
+- delete: now only soft-deletes archives (same for prune)
+- repo-list: --deleted lists deleted archives
+- undelete: undelete soft-deleted archives, #8500
+
+Fixes:
+
+- chunks index cache:
+
+  - enable partial/incremental updates (F_NEW flag).
+  - write chunks index every 10mins, #8503.
+    this makes sure progress is not totally lost when a backup is interrupted.
+  - write to repo/cache/chunks.<HASH> to enable parallel updates.
+- mount: fix check_pending_archive to give correct root dir, #8528
+
+Other changes:
+
+- repo-compress: reduce memory consumption (F_COMPRESS flag)
+- files cache: reduce memory consumption, #5756
+- check: rename --undelete-archives to --find-lost-archives
+- check: rebuild_archives_directory: accelerate by only reading metadata
+- shell completions: adapt zsh for borg 2.0.0b13 - needs more work!
+- chunk index: rename .refcount to .flags, use it for user and system flags.
+- vagrant:
+
+  - add bookworm32 box for 32bit platform testing
+  - fix pythons on freebsd14
+  - simplify openindiana box setup
+- docs:
+
+  - remove --bypass-lock, small changes regarding compression
+  - FAQ: clean up entries regarding SSH settings
+
+
+Version 2.0.0b13 (2024-10-31)
+-----------------------------
+
+New features:
+
 - implement special tags, @PROT tag for protecting archives, #953.
 
   borg won't delete/prune/recreate protected archives.

{borgbackup-2.0.0b13 → borgbackup-2.0.0b15}/docs/conf.py

@@ -42,7 +42,7 @@ master_doc = "index"
 
 # General information about the project.
 project = "Borg - Deduplicating Archiver"
-copyright = "2010-2014 Jonas Borgström, 2015-2024 The Borg Collective (see AUTHORS file)"
+copyright = "2010-2014 Jonas Borgström, 2015-2025 The Borg Collective (see AUTHORS file)"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -110,6 +110,7 @@ def set_rst_settings(app):
 
 
 def setup(app):
+    app.setup_extension("sphinxcontrib.jquery")
     app.add_css_file("css/borg.css")
     app.connect("builder-inited", set_rst_settings)
 
@@ -243,6 +244,8 @@ extensions = [
     "sphinx.ext.todo",
     "sphinx.ext.coverage",
     "sphinx.ext.viewcode",
+    "sphinxcontrib.jquery",  # jquery is not included anymore by default
+    "guzzle_sphinx_theme",  # register the theme as an extension to generate a sitemap.xml
 ]
 
 extlinks = {

{borgbackup-2.0.0b13 → borgbackup-2.0.0b15}/docs/deployment/automated-local.rst

@@ -32,9 +32,9 @@ All configuration goes into this directory.
 Find out the ID of the partition table of your backup disk (here assumed to be /dev/sdz):
     lsblk --fs -o +PTUUID /dev/sdz
 
-Then, create ``/etc/backups/40-backup.rules`` with the following content (all on one line)::
+Then, create ``/etc/backups/80-backup.rules`` with the following content (all on one line)::
 
-    ACTION=="add", SUBSYSTEM=="block", ENV{ID_PART_TABLE_UUID}=="<the PTUUID you just noted>", TAG+="systemd", ENV{SYSTEMD_WANTS}="automatic-backup.service"
+    ACTION=="add", SUBSYSTEM=="block", ENV{ID_PART_TABLE_UUID}=="<the PTUUID you just noted>", TAG+="systemd", ENV{SYSTEMD_WANTS}+="automatic-backup.service"
 
 The "systemd" tag in conjunction with the SYSTEMD_WANTS environment variable has systemd
 launch the "automatic-backup" service, which we will create next, as the
@@ -164,7 +164,7 @@ The last part is actually to enable the udev rules and services:
 
 .. code-block:: bash
 
-    ln -s /etc/backups/40-backup.rules /etc/udev/rules.d/40-backup.rules
+    ln -s /etc/backups/80-backup.rules /etc/udev/rules.d/80-backup.rules
     ln -s /etc/backups/automatic-backup.service /etc/systemd/system/automatic-backup.service
     systemctl daemon-reload
     udevadm control --reload

{borgbackup-2.0.0b13 → borgbackup-2.0.0b15}/docs/deployment/image-backup.rst

@@ -63,28 +63,28 @@ deduplicating. For backup, save the disk header and the contents of each partiti
 
     HEADER_SIZE=$(sfdisk -lo Start $DISK | grep -A1 -P 'Start$' | tail -n1 | xargs echo)
     PARTITIONS=$(sfdisk -lo Device,Type $DISK | sed -e '1,/Device\s*Type/d')
-    dd if=$DISK count=$HEADER_SIZE | borg create repo::hostname-partinfo -
+    dd if=$DISK count=$HEADER_SIZE | borg create --repo repo hostname-partinfo -
     echo "$PARTITIONS" | grep NTFS | cut -d' ' -f1 | while read x; do
         PARTNUM=$(echo $x | grep -Eo "[0-9]+$")
-        ntfsclone -so - $x | borg create repo::hostname-part$PARTNUM -
+        ntfsclone -so - $x | borg create --repo repo hostname-part$PARTNUM -
     done
     # to back up non-NTFS partitions as well:
     echo "$PARTITIONS" | grep -v NTFS | cut -d' ' -f1 | while read x; do
         PARTNUM=$(echo $x | grep -Eo "[0-9]+$")
-        borg create --read-special repo::hostname-part$PARTNUM $x
+        borg create --read-special --repo repo hostname-part$PARTNUM $x
     done
 
 Restoration is a similar process::
 
-    borg extract --stdout repo::hostname-partinfo | dd of=$DISK && partprobe
+    borg extract --stdout --repo repo hostname-partinfo | dd of=$DISK && partprobe
     PARTITIONS=$(sfdisk -lo Device,Type $DISK | sed -e '1,/Device\s*Type/d')
     borg list --format {archive}{NL} repo | grep 'part[0-9]*$' | while read x; do
         PARTNUM=$(echo $x | grep -Eo "[0-9]+$")
         PARTITION=$(echo "$PARTITIONS" | grep -E "$DISKp?$PARTNUM" | head -n1)
         if echo "$PARTITION" | cut -d' ' -f2- | grep -q NTFS; then
-            borg extract --stdout repo::$x | ntfsclone -rO $(echo "$PARTITION" | cut -d' ' -f1) -
+            borg extract --stdout --repo repo $x | ntfsclone -rO $(echo "$PARTITION" | cut -d' ' -f1) -
         else
-            borg extract --stdout repo::$x | dd of=$(echo "$PARTITION" | cut -d' ' -f1)
+            borg extract --stdout --repo repo $x | dd of=$(echo "$PARTITION" | cut -d' ' -f1)
         fi
     done
 
@@ -105,11 +105,11 @@ except it works in place, zeroing the original partition. This makes the backup
 a bit simpler::
 
     sfdisk -lo Device,Type $DISK | sed -e '1,/Device\s*Type/d' | grep Linux | cut -d' ' -f1 | xargs -n1 zerofree
-    borg create --read-special repo::hostname-disk $DISK
+    borg create --read-special --repo repo hostname-disk $DISK
 
 Because the partitions were zeroed in place, restoration is only one command::
 
-    borg extract --stdout repo::hostname-disk | dd of=$DISK
+    borg extract --stdout --repo repo hostname-disk | dd of=$DISK
 
 .. note:: The "traditional" way to zero out space on a partition, especially one already
           mounted, is simply to ``dd`` from ``/dev/zero`` to a temporary file and delete