From 2840dc63ee3069e833ee370b19dc4ae3080aadc8 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Thu, 9 Jul 2015 12:11:55 +0200 Subject: [PATCH] Import patches-unapplied version 2.330 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: 1d69cd75b2aa568aa3c8c582f7aadb368fc95d56 New changelog entries: * fix another quoting issue in snappy --- debian/changelog | 6 ++++++ .../ubuntu-core/hooks/500-move-kernel-to-device-tar.binary | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0997f48b..b97f4864 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.330) wily; urgency=medium + + * fix another quoting issue in snappy + + -- Oliver Grawert Thu, 09 Jul 2015 12:11:55 +0200 + livecd-rootfs (2.329) wily; urgency=medium [ Ɓukasz Zemczak ] diff --git a/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary b/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary index f6b6686d..78a09110 100644 --- a/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary +++ b/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary @@ -42,8 +42,8 @@ mkdir -p $TMPDIR/assets/ # and all others grub # common bits cat > $TMPDIR/hardware.yaml << EOF -kernel: assets/$(basename "$kernel") -initrd: assets/$(basename "$initrd") +kernel: assets/$(basename $kernel) +initrd: assets/$(basename $initrd) partition-layout: system-AB EOF