summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-04-30 09:41:38 +0000
committerintrigeri <intrigeri@boum.org>2019-04-30 09:41:38 +0000
commite6360957e8a238a4ffa4a15aacd02d5e7cc6cb3b (patch)
tree5cbd00c67706505756f9f84bc98d14c2fc902888
parent448d5b2a4985692a6ed0fdabcaeab027291cd95a (diff)
parentff35b8e71ece42d0e5ae17c8ebe1b0110534e019 (diff)
New upstream version 2.1.1upstream/2.1.1upstream
-rw-r--r--Build.PL2
-rw-r--r--Changes31
-rw-r--r--META.json2
-rw-r--r--META.yml2
-rwxr-xr-xbin/tails-persistence-setup4
-rw-r--r--lib/Tails/Persistence/Configuration/ConfigFile.pm5
6 files changed, 39 insertions, 7 deletions
diff --git a/Build.PL b/Build.PL
index 7cba2a5..30703cc 100644
--- a/Build.PL
+++ b/Build.PL
@@ -20,7 +20,7 @@ my %module_build_args = (
"Tails developers <tails\@boum.org>"
],
"dist_name" => "Tails-Persistence",
- "dist_version" => "2.1.0",
+ "dist_version" => "2.1.1",
"license" => "gpl",
"module_name" => "Tails::Persistence",
"recursive_test_files" => 1,
diff --git a/Changes b/Changes
index 1e3cb84..84ddb5d 100644
--- a/Changes
+++ b/Changes
@@ -1,11 +1,38 @@
==================================================
-Changes from 1745-06-02 00:00:00 +0000 to present.
+Changes from 1745-07-16 00:00:00 +0000 to present.
==================================================
------------------------------------------
-version 2.1.0 at 2019-03-17 08:11:19 +0000
+version 2.1.1 at 2019-04-30 09:41:13 +0000
------------------------------------------
+ Change: ff35b8e71ece42d0e5ae17c8ebe1b0110534e019
+ Author: intrigeri <intrigeri@boum.org>
+ Date : 2019-04-30 09:40:35 +0000
+
+ tails-persistence-setup 2.1.1
+
+ Change: 371e075cb93729ed2beb256c271dbd86ec3fb3cc
+ Author: user <user@localhost>
+ Date : 2019-04-28 17:43:19 +0000
+
+ Merge branch 'bugfix/16568-more-robust-backup' (Closes: #16461)
+
+ Change: b111137caf01c84e15db39f82799e68a044b76f1
+ Author: intrigeri <intrigeri@boum.org>
+ Date : 2019-04-26 13:20:12 +0000
+
+ Make writing persistence.conf.bak more robust
+
+ In exactly the same way as what we did recently for persistence.conf
+ in the "save" method, let's do our best to ensure the
+ persistence.conf.bak backup file is actually written to disk,
+ regardless of what may happen later (e.g. unclear shutdown).
+
+-------------------------------------
+version at 2019-03-17 08:10:27 +0000
+-------------------------------------
+
Change: a3a442e77deb60c798542b3654b57a24de278a29
Author: intrigeri <intrigeri@boum.org>
Date : 2019-03-17 08:10:27 +0000
diff --git a/META.json b/META.json
index 5d52ac8..79d32bb 100644
--- a/META.json
+++ b/META.json
@@ -84,7 +84,7 @@
"url" : "git://git.immerda.ch/tails/persistence-setup.git"
}
},
- "version" : "2.1.0",
+ "version" : "2.1.1",
"x_generated_by_perl" : "v5.28.1",
"x_serialization_backend" : "Cpanel::JSON::XS version 4.09"
}
diff --git a/META.yml b/META.yml
index 532b6a7..05192dc 100644
--- a/META.yml
+++ b/META.yml
@@ -52,6 +52,6 @@ requires:
resources:
homepage: https://tails.boum.org/
repository: git://git.immerda.ch/tails/persistence-setup.git
-version: 2.1.0
+version: 2.1.1
x_generated_by_perl: v5.28.1
x_serialization_backend: 'YAML::Tiny version 1.73'
diff --git a/bin/tails-persistence-setup b/bin/tails-persistence-setup
index 3cf0326..3c5ac25 100755
--- a/bin/tails-persistence-setup
+++ b/bin/tails-persistence-setup
@@ -6,14 +6,14 @@ tails-persistence-setup - setup Tails persistent storage
=head1 VERSION
-Version 2.1.0
+Version 2.1.1
=cut
use strictures 2;
use 5.10.1;
-our $VERSION = '2.1.0';
+our $VERSION = '2.1.1';
use FindBin;
use lib "$FindBin::Bin/../lib";
diff --git a/lib/Tails/Persistence/Configuration/ConfigFile.pm b/lib/Tails/Persistence/Configuration/ConfigFile.pm
index aebff9e..6fc63eb 100644
--- a/lib/Tails/Persistence/Configuration/ConfigFile.pm
+++ b/lib/Tails/Persistence/Configuration/ConfigFile.pm
@@ -96,6 +96,11 @@ Copy the on-disk configuration file to a backup file.
method backup () {
$self->config_file_path->copy($self->backup_config_file_path);
$self->backup_config_file_path->chmod(0600);
+ # Ensure our changes land on the disk
+ systemx('sync', $self->backup_config_file_path->stringify);
+ # Ensure changes made elsewhere are written synchronously on the disk
+ # (in case something else ever needs to modify this file)
+ systemx('chattr', '+S', $self->backup_config_file_path->stringify);
}
=head2 save