Renaming --apt-source to --apt-source-archives.

2 files changed, 27 insertions, 27 deletions

diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 59f0d9d54..2b185cd71 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -56,7 +56,7 @@ cat > chroot/etc/apt/sources.list << EOF
 deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
 EOF
 
-		if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+		if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 		then
 			echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 		fi
@@ -84,7 +84,7 @@ EOF
 
 				echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
-				if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+				if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 				then
 					echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 				fi
@@ -103,7 +103,7 @@ EOF
 						*)
 							echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 							then
 								echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 							fi
@@ -120,7 +120,7 @@ EOF
 							*)
 								echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
-								if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+								if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 								then
 									echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 								fi
@@ -131,7 +131,7 @@ EOF
 						then
 							echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
-							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 							then
 								echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 							fi
@@ -142,7 +142,7 @@ EOF
 				ubuntu|kubuntu)
 					echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 					then
 						echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 					fi
@@ -156,7 +156,7 @@ EOF
 				debian|ubuntu|kubuntu)
 					echo "deb ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 					then
 						echo "deb-src ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 					fi
@@ -167,7 +167,7 @@ EOF
 			then
 				echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
-				if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+				if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 				then
 					echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 				fi
@@ -182,7 +182,7 @@ EOF
 					then
 						echo "deb ${LB_PARENT_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-						if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+						if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 						then
 							echo "deb-src ${LB_PARENT_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 						fi
@@ -194,7 +194,7 @@ EOF
 			then
 				echo "deb ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
-				if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+				if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 				then
 					echo "deb-src ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 				fi
@@ -604,7 +604,7 @@ cat > chroot/etc/apt/sources.list << EOF
 deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
 EOF
 
-		if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+		if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 		then
 			echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 		fi
@@ -632,7 +632,7 @@ EOF
 
 				echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
-				if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+				if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 				then
 					echo "deb-src ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 				fi
@@ -651,7 +651,7 @@ EOF
 						*)
 							echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 							then
 								echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 							fi
@@ -668,7 +668,7 @@ EOF
 							*)
 								echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
-								if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+								if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 								then
 									echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 								fi
@@ -679,7 +679,7 @@ EOF
 						then
 							echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
-							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+							if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 							then
 								echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 							fi
@@ -690,7 +690,7 @@ EOF
 				ubuntu|kubuntu)
 					echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 					then
 						echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 					fi
@@ -704,7 +704,7 @@ EOF
 				debian|ubuntu|kubuntu)
 					echo "deb ${LB_PARENT_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 					then
 						echo "deb-src ${LB_PARENT_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 					fi
@@ -715,7 +715,7 @@ EOF
 			then
 				echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
-				if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+				if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 				then
 					echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 				fi
@@ -730,7 +730,7 @@ EOF
 					then
 						echo "deb ${LB_PARENT_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
-						if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+						if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 						then
 							echo "deb-src ${LB_PARENT_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 						fi
@@ -742,7 +742,7 @@ EOF
 			then
 				echo "deb ${LB_MIRROR_BINARY_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 
-				if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE}" = "true" ]
+				if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 				then
 					echo "deb-src ${LB_MIRROR_BINARY_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
 				fi
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index b4d66a1f7..5e61c3e84 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -38,7 +38,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--apt-pipeline DEPTH]\n\
 \t    [--apt-recommends true|false]\n\
 \t    [--apt-secure true|false]\n\
-\t    [--apt-source true|false]\n\
+\t    [--apt-source-archives true|false]\n\
 \t    [-a|--architectures ARCHITECTURE]\n\
 \t    [-b|--binary-images iso|iso-hybrid|net|tar|usb-hdd]\n\
 \t    [--binary-filesystem fat16|fat32|ext2]\n\
@@ -150,7 +150,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 Local_arguments ()
 {
 	LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitute-options:,
-		apt-pipeline:,apt-recommends:,apt-secure:,apt-source:,bootstrap:,cache:,cache-indices:,cache-packages:,
+		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:,root-command:,use-fakeroot:,tasksel:,includes:,
 		templates:,architectures:,bootstrap-flavour:,bootstrap-keyring:,clean,
@@ -271,8 +271,8 @@ Local_arguments ()
 				shift 2
 				;;
 
-			--apt-source)
-				LB_APT_SOURCE="${2}"
+			--apt-source-archives)
+				LB_APT_SOURCE_ARCHIVES="${2}"
 				shift 2
 				;;
 
@@ -915,9 +915,9 @@ LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS}"
 # (Default: ${LB_APT_SECURE})
 LB_APT_SECURE="${LB_APT_SECURE}"
 
-# \$LB_APT_SOURCE: set apt/aptitude source entries in sources.list
-# (Default: ${LB_APT_SOURCE})
-LB_APT_SOURCE="${LB_APT_SOURCE}"
+# \$LB_APT_SOURCE_ARCHIVES: set apt/aptitude source entries in sources.list
+# (Default: ${LB_APT_SOURCE_ARCHIVES})
+LB_APT_SOURCE_ARCHIVES="${LB_APT_SOURCE_ARCHIVES}"
 
 # \$LB_BOOTSTRAP: set bootstrap program
 # (Default: ${LB_BOOTSTRAP})