From 32609d380d6b9feb1733aa135861c219f1931b9f Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Sat, 13 Apr 2019 11:26:07 +0000 Subject: [PATCH] Imported 2.578 No reason for CPC update specified. --- debian/changelog | 7 +++++++ live-build/functions | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9ff52b83..16ba25d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.578) disco; urgency=medium + + * Fix the sed script that Tobias had right in the first place and I + mangled in the previous upload. + + -- Steve Langasek Sat, 13 Apr 2019 02:13:19 -0700 + livecd-rootfs (2.577) disco; urgency=medium [ Tobias Koch ] diff --git a/live-build/functions b/live-build/functions index fe766d72..7908900c 100644 --- a/live-build/functions +++ b/live-build/functions @@ -448,7 +448,7 @@ _snap_post_process() { # Remove snap, assertions and entry in seed.yaml rm -f ${snaps_dir}/snapd_[0-9]*.snap rm -f ${assertions_dir}/snapd_[0-9]*.assert - sed -i -e'/name: snapd/,+2d' $seed_yaml + sed -i -e'N;/name: snapd/,+2d' $seed_yaml fi ;; *)