From 50e0f20c69f67babc9bcae634185967e9a930eea Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Thu, 9 Jul 2015 18:19:27 +0200
Subject: [PATCH] Get previous ubuntu-core changes on desktop-next

---
 debian/changelog                              |  6 ++++
 .../hooks/04-configure_network.chroot         |  9 -----
 .../500-move-kernel-to-device-tar.binary      | 33 ++++++++-----------
 3 files changed, 20 insertions(+), 28 deletions(-)
 delete mode 100755 live-build/ubuntu-desktop-next/hooks/04-configure_network.chroot

diff --git a/debian/changelog b/debian/changelog
index 45605c36..3bb012fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.332) UNRELEASED; urgency=medium
+
+  * Get previous ubuntu-core changes on desktop-next
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 09 Jul 2015 18:18:43 +0200
+
 livecd-rootfs (2.331) wily; urgency=medium
 
   * merge lp:~sergiusens/livecd-rootfs/eth0Not to not hardcode eth0 anymore on
diff --git a/live-build/ubuntu-desktop-next/hooks/04-configure_network.chroot b/live-build/ubuntu-desktop-next/hooks/04-configure_network.chroot
deleted file mode 100755
index d96d9aa8..00000000
--- a/live-build/ubuntu-desktop-next/hooks/04-configure_network.chroot
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -x
-
-if=eth0
-
-# Manually configure the first ethernet device
-cat >/etc/network/interfaces.d/"$if"<<EOT
-allow-hotplug $if
-iface $if inet dhcp
-EOT
diff --git a/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary b/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary
index 31c6092f..9afe61db 100644
--- a/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary
+++ b/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary
@@ -14,41 +14,36 @@ mkdir -p $TMPDIR/assets/
 
 # cp files, we can't simply use tar --transform as it changes the symlink target
 (
- cd binary/boot/filesystem.dir 
+ cd binary/boot/filesystem.dir
 
- # for compatibility with current grub/u-d-f
- cp -ar --parent boot/vmlinu?-* boot/initrd.img-* boot/abi-* boot/System.map-* $TMPDIR/system/
- if [ -e vmlinu? ] && [ -e initrd.img ]; then
-     cp -ar --parent vmlinu? initrd.img $TMPDIR/system
- fi
  cp -ar --parent lib/modules/ $TMPDIR/system/
  cp -ar --parent lib/firmware/ $TMPDIR/system/
 
  # new assets handling
- # FIXME:
- # - how to keep version information (and do we care)
  if [ -f boot/vmlinu?-*.signed ]; then
-    cp -ar boot/vmlinu?-*.signed $TMPDIR/assets/vmlinuz
+    kernel=boot/vmlinu?-*.signed
  else
-    cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz
+    kernel=boot/vmlinu?-*
  fi
- cp -ar boot/initrd.img-* $TMPDIR/assets/initrd.img
+
+ initrd=boot/initrd.img-*
+
+ cp -ar $initrd $TMPDIR/assets/
+ cp -ar $kernel $TMPDIR/assets/
  cp -ar boot/abi-* boot/System.map-* $TMPDIR/assets/
 
  dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
  if [ -n "$dtbs" ]; then
     mv "$dtbs" $TMPDIR/assets/dtbs
  fi
-)
 
-# create hardware.yaml for u-boot
-# this assumes armh == u-boot
-# and all others grub
-(
-# common bits
+ # create hardware.yaml
+ # this assumes armh == u-boot
+ # and all others grub
+ # common bits
  cat > $TMPDIR/hardware.yaml << EOF
-kernel: assets/vmlinuz
-initrd: assets/initrd.img
+kernel: assets/$(basename $kernel)
+initrd: assets/$(basename $initrd)
 partition-layout: system-AB
 EOF