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

@@ -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 <robert.jennings@canonical.com>  Thu, 07 Jun 2018 14:12:26 -0700
+
 livecd-rootfs (2.408.31) xenial; urgency=medium
 
   * Backport snap preseeding functions from bionic. (LP: #1771177)

debian/control

@@ -12,6 +12,7 @@ Depends: ${misc:Depends},
          android-tools-fsutils [armhf],
          apt-utils,
          debootstrap,
+         distro-info,
          dosfstools,
          e2fsprogs,
          gdisk,

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 ()
 {