From 05681cd00040ce5e1dde258a5ef6ce9a3f5770e8 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Fri, 19 Jul 2019 01:00:07 +0000 Subject: [PATCH] Imported 2.602 No reason for CPC update specified. --- debian/changelog | 7 +++++++ live-build/auto/config | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 94ff2e91..57540227 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.602) eoan; urgency=medium + + [ David Krauser ] + * Fixing broken binary hook symlinks for hyperv gallery image builds. + + -- Dimitri John Ledkov Thu, 18 Jul 2019 14:07:10 +0100 + livecd-rootfs (2.601) eoan; urgency=medium [ Michael Vogt ] diff --git a/live-build/auto/config b/live-build/auto/config index 28667e64..4c7a1f1e 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1105,8 +1105,8 @@ EOF ubuntu-core:system-image|ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled) # Ensure that most things e.g. includes.chroot are copied as is for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do - case entry in - hooks) + case $entry in + *hooks*) # But hooks are shared across the projects with symlinks # dereference them cp -afL $entry config/