[SCM] live-build branch, debian-next, updated. debian/3.0_a57-1-19-g80bfaf9

Daniel Baumann daniel at debian.org
Mon Aug 27 12:48:04 UTC 2012


The following commit has been merged in the debian-next branch:
commit 80bfaf9f0a316bc6c95d461fe9344ebff3a46a8b
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 27 14:47:10 2012 +0200

    Exposing --debootstrap-options and --cdebootstrap-options publicly.

diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 0a72cef..5041638 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -140,7 +140,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 
 Local_arguments ()
 {
-	LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitute-options:,
+	LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitute-options:debootstrap-options:,cdebootstrap-ptions,
 		apt-pipeline:,apt-recommends:,apt-secure:,apt-source-archives:,bootstrap:,cache:,cache-indices:,cache-packages:,
 		cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
 		initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,root-command:,use-fakeroot:,tasksel:,
@@ -273,6 +273,16 @@ Local_arguments ()
 				shift 2
 				;;
 
+			--debootstrap-options)
+				DEBOOTSTRAP_OPTIONS="${2}"
+				shift 2
+				;;
+
+			--cdebootstrap-options)
+				CDEBOOTSTRAP_OPTIONS="${2}"
+				shift 2
+				;;
+
 			--cache)
 				LB_CACHE="${2}"
 				shift 2
@@ -1075,6 +1085,8 @@ _QUIET="${_QUIET}"
 # Internal stuff (FIXME)
 APT_OPTIONS="${APT_OPTIONS}"
 APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
+DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS}"
+CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS}"
 GZIP_OPTIONS="${GZIP_OPTIONS}"
 ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
 EOF

-- 
live-build



More information about the debian-live-changes mailing list