From c7878bdc76ffff63852f2f4149df969c64e50545 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Thu, 7 Jun 2018 14:54:23 -0700 Subject: [PATCH] snaps: Fixes for snap pre-seeding (LP: #1775710) * Add dependency on distro-info for snap preseeding * Move snap-related functions to avoid conflicts with ubuntu-cpc functions --- debian/changelog | 8 ++++++++ debian/control | 1 + live-build/auto/config | 2 +- live-build/{functions => functions.snaps} | 0 4 files changed, 10 insertions(+), 1 deletion(-) rename live-build/{functions => functions.snaps} (100%) diff --git a/debian/changelog b/debian/changelog index cc0d8c57..4e12d4db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.408.32) xenial; urgency=medium + + * snaps: Fixes for snap pre-seeding (LP: #1775710) + * Add dependency on distro-info for snap preseeding + * Move snap-related functions to avoid conflicts with ubuntu-cpc functions + + -- Robert C Jennings Thu, 07 Jun 2018 14:12:26 -0700 + livecd-rootfs (2.408.31) xenial; urgency=medium * Backport snap preseeding functions from bionic. (LP: #1771177) diff --git a/debian/control b/debian/control index fd7f72f1..ab1cc33f 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ Depends: ${misc:Depends}, android-tools-fsutils [armhf], apt-utils, debootstrap, + distro-info, dosfstools, e2fsprogs, gdisk, diff --git a/live-build/auto/config b/live-build/auto/config index 3c659bef..875f5ea3 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -34,7 +34,7 @@ if [ -z "$MIRROR" ]; then fi mkdir -p config/package-lists -cp -af /usr/share/livecd-rootfs/live-build/functions config/functions +cp -af /usr/share/livecd-rootfs/live-build/functions.snaps config/functions.snaps add_task () { diff --git a/live-build/functions b/live-build/functions.snaps similarity index 100% rename from live-build/functions rename to live-build/functions.snaps