From df1cea54c56ecd4ea99e2d9d5d3cb3ce075b150a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 27 Aug 2012 14:26:08 +0200 Subject: Removing bootstrap-flavour option (Closes: #685675). live-build does too much magic that causes too much effort in maintaining for stuff that hardly everyone uses. Rather than 'translating' back and forth and maintaining compatibility between options of different debootstrap and cdebootstrap versions (and possibly any other in the future), it's is better to 'off-load' this to the user. For non-live specific options passed to the bootstrap tools, we'll be introducing --debootstrap-options and --cdebootstrap-options where users can specify their additional options passed to the respective bootstrap tool, rather than us maintaining them in a 'hardcoded' and selected list. --- frontends/cgi/live-build-cgi | 2 -- 1 file changed, 2 deletions(-) (limited to 'frontends/cgi/live-build-cgi') diff --git a/frontends/cgi/live-build-cgi b/frontends/cgi/live-build-cgi index 489c815ad..55ce08302 100755 --- a/frontends/cgi/live-build-cgi +++ b/frontends/cgi/live-build-cgi @@ -73,7 +73,6 @@ else # Advanced bootstrap options LB_ARCHITECTURES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1) - LB_BOOTSTRAP_FLAVOUR=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootstrap_flavour=[a-z]+' | cut -f 2 -d '=' | head -n1) LB_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1) # Advanced chroot options @@ -130,7 +129,6 @@ else -e "s#_LB_CONFIG#${_LB_CONFIG}#" \ -e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \ -e "s/LB_ARCHITECTURES/${LB_ARCHITECTURES}/" \ - -e "s/LB_BOOTSTRAP_FLAVOUR/${LB_BOOTSTRAP_FLAVOUR}/" \ -e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \ -e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \ -e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \ -- cgit v1.2.3