From 9ee4945699c0bdedde913d6ee34c026618d30319 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 10 May 2014 13:54:42 +0100 Subject: [PATCH] Import patches-unapplied version 2.209 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: d0fa866363b648b591e3ba31a101af1f29c07204 New changelog entries: * live-build/auto/config: Pass any additional command-line arguments on to "lb config". --- debian/changelog | 7 +++++++ live-build/auto/config | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b3adff76..021df2bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.209) utopic; urgency=medium + + * live-build/auto/config: Pass any additional command-line arguments on to + "lb config". + + -- Colin Watson Sat, 10 May 2014 13:54:42 +0100 + livecd-rootfs (2.208) trusty; urgency=medium * Adding support for ubuntu-touch i386 based images diff --git a/live-build/auto/config b/live-build/auto/config index cc825d03..07a82e3d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -424,7 +424,8 @@ lb config noauto \ --bootloader "$BOOTLOADER" \ --initramfs-compression lzma \ ${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \ - $OPTS + $OPTS \ + "$@" echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary