summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2023-01-08 20:27:56 +0000
committerColin Watson <cjwatson@debian.org>2023-01-08 20:27:56 +0000
commit9ed58c21e83fb14b24363faa1f24918c291763de (patch)
tree9b91033738ca3422377d3d31f70e4569a0fd104f
parent927ca6be2b4bcfefe5da5ada0dd41aec6c236f8f (diff)
Don't remove /var/cache/debconf/tmp.ci
This avoids warnings if it's a mountpoint, and also slightly reduces disk writes. Closes: #1028128
-rw-r--r--debian/changelog2
-rwxr-xr-xdpkg-preconfigure4
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index f58dcb07..bc32711d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
debconf (1.5.82) UNRELEASED; urgency=medium
* Bump debhelper from old 12 to 13.
+ * Don't remove /var/cache/debconf/tmp.ci, to avoid warnings if it's a
+ mountpoint (closes: #1028128).
-- Colin Watson <cjwatson@debian.org> Mon, 02 Jan 2023 13:04:53 -0000
diff --git a/dpkg-preconfigure b/dpkg-preconfigure
index e0db5b19..c1f24441 100755
--- a/dpkg-preconfigure
+++ b/dpkg-preconfigure
@@ -141,7 +141,7 @@ if (! $have_tty && $frontend->need_tty) {
}
my $tempdir='/var/cache/debconf/tmp.ci';
-remove_tree($tempdir, { safe => 1 });
+remove_tree($tempdir, { safe => 1, keep_root => 1 });
make_path($tempdir);
# Use the external package scanner for speed. It takes a list of debs
@@ -248,7 +248,7 @@ $frontend->shutdown;
# Save state.
Debconf::Db->save;
-remove_tree($tempdir, { safe => 1 });
+remove_tree($tempdir, { safe => 1, keep_root => 1 });
=head1 AUTHOR