From f27686011453985e8a1dca45c42fea9b297b56e6 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 16 Mar 2018 18:36:56 +0000 Subject: [PATCH] Import patches-unapplied version 2.511 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: dcf2b800f60c2a48a1edf57579594e370a914c6e New changelog entries: * Whitelist preserving "unowned" /var/log/journal. Maybe systemd package should own the directory, and only adjust the permissions in postinst. LP: #1754332 --- debian/changelog | 8 ++++++++ live-build/ubuntu-cpc/hooks/099-cleanup.chroot | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4a922a40..5c8e621b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.511) bionic; urgency=medium + + * Whitelist preserving "unowned" /var/log/journal. Maybe systemd package + should own the directory, and only adjust the permissions in + postinst. LP: #1754332 + + -- Dimitri John Ledkov Fri, 16 Mar 2018 18:36:56 +0000 + livecd-rootfs (2.510) bionic; urgency=medium * Rename the directory containing the systemd override file for subiquity to diff --git a/live-build/ubuntu-cpc/hooks/099-cleanup.chroot b/live-build/ubuntu-cpc/hooks/099-cleanup.chroot index cf2b7dd1..ec0b05c6 100755 --- a/live-build/ubuntu-cpc/hooks/099-cleanup.chroot +++ b/live-build/ubuntu-cpc/hooks/099-cleanup.chroot @@ -27,7 +27,7 @@ do done # Remove un-owned log directories -whitelisted_dirs=(/var/log/fsck) +whitelisted_dirs=(/var/log/fsck /var/log/journal) for log_d in $(find /var/log/* -type d) do