summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/local/btrfs.hook1
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d4f5d16e..5063d6c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+btrfs-progs (4.16.1-2) unstable; urgency=medium
+
+ * Do not copy_exec btrfs-zero-log into initramfs, superseeded by `btrfs
+ rescue zero-log` sub-command. Closes: #898720, #898719.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 15 May 2018 14:15:27 +0100
+
btrfs-progs (4.16.1-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/local/btrfs.hook b/debian/local/btrfs.hook
index f4dbb9da..3c62fb53 100644
--- a/debian/local/btrfs.hook
+++ b/debian/local/btrfs.hook
@@ -21,7 +21,6 @@ esac
if [ -x /bin/btrfs ]
then
copy_exec /bin/btrfs /bin
- copy_exec /bin/btrfs-zero-log
if [ ! -x /usr/share/initramfs-tools/hooks/fsck ] && [ ! -x /etc/initramfs-tools/hooks/fsck ]
then
copy_exec /bin/fsck.btrfs /bin