+livecd-rootfs (2.396~ppa5) xenial; urgency=medium
+
+  [ Adam Conrad ]
   * Remove obsolete pvr-omap4 special-casing to simplify configs.
 
- -- Adam Conrad <adconrad@ubuntu.com>  Sun, 03 Apr 2016 02:39:50 -0600
+  [ Oliver Grawert ]
+  * live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot:
+    create a generic initrd inside the snappy os-snap so we do not need the
+    hackish ubuntu-core-generic-initrd package anymore.
+  * 
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Sun, 03 Apr 2016 02:39:50 -0600
 
 livecd-rootfs (2.395) xenial; urgency=medium
 

=== modified file 'live-build/auto/config'
--- live-build/auto/config	2016-04-03 08:41:30 +0000
+++ live-build/auto/config	2016-04-07 13:36:08 +0000
@@ -403,6 +403,10 @@
 			esac
 			OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 
+			# work around lb_chroot_hacks trying to blindly compress
+			# every initrd it finds in /boot
+			export LB_INITRAMFS_COMPRESSION="none"
+
 			# contains the framework definition
 			add_package install ubuntu-core-libs
 

=== added file 'live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot'
--- live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot	1970-01-01 00:00:00 +0000
+++ live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot	2016-04-07 13:44:27 +0000
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+set -ex
+
+IVER="$(dpkg -s initramfs-tools-ubuntu-core | \
+			sed -n '/^Version:/{s/^[^: ]*: \([^: ]*\).*/\1/;p;}')"
+
+# force lzma
+mkdir -p /etc/initramfs-tools/conf.d
+echo "COMPRESS=lzma" >/etc/initramfs-tools/conf.d/snappy-generic-initrd.conf
+
+update-initramfs.REAL -c -kcore-$IVER -v
+
+cd /boot
+ln -s initrd.img-core-$IVER initrd.img-core
+cd -
+
+sha1sum /boot/initrd.img-core >/var/lib/initramfs-tools/core
+
+# for snapcraft backwards compatibility
+mkdir -p /usr/lib/ubuntu-core-generic-initrd
+cp -a /boot/initrd.img-core* /usr/lib/ubuntu-core-generic-initrd/