add compability handling for current u-d-f/grub when extracting

the device tarball

debian/changelog

@@ -1,7 +1,9 @@
-livecd-rootfs (2.296) UNRELEASED; urgency=low
+livecd-rootfs (2.296~ppa1) vivid; urgency=low
 
   * merged lp:~snappy-dev/livecd-rootfs/core_update
     to generate device tar conform hardware.yaml
+  * add compability handling for current u-d-f/grub when extracting
+    the device tarball
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 25 Mar 2015 14:43:38 +0100
 

live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary

@@ -15,16 +15,23 @@ mkdir -p $TMPDIR/assets/
 # cp files, we can't simply use tar --transform as it changes the symlink target
 (
  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
  cp -ar boot/vmlinu?-* $TMPDIR/assets/vmlinuz
  cp -ar boot/initrd.img-* $TMPDIR/assets/initrd.img
  cp -ar boot/vmlinu?-* boot/initrd.img-* boot/abi-* boot/System.map-* $TMPDIR/assets/
- cp -ar --parent lib/modules/ $TMPDIR/system/
 
  dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
  [ -n "$dtbs" ] && mv "$dtbs" $TMPDIR/assets/dtbs
 
- cp -ar --parent lib/firmware/ $TMPDIR/system/
-
  if [ -e vmlinu? ] && [ -e initrd.img ]; then
      cp -ar --parent vmlinu? initrd.img $TMPDIR/assets
      cp -ar --parent vmlinu? initrd.img $TMPDIR/assets