[SCM] live-build branch, debian-next, updated. debian/3.0_a11-1-18-g8757873
Daniel Baumann
daniel at debian.org
Mon Feb 14 12:12:55 UTC 2011
The following commit has been merged in the debian-next branch:
commit 8757873759bdd31b47e78e690e664363b1b59985
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Feb 14 13:11:26 2011 +0100
Renaming mirror options to parent mirror for handling derivatives nice in future.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 44245f3..0415e6e 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -294,54 +294,54 @@ Set_defaults ()
# Setting mirror to fetch packages from
case "${LB_MODE}" in
debian)
- LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://ftp.de.debian.org/debian/}"
+ LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.de.debian.org/debian/}"
;;
emdebian)
- LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://buildd.emdebian.org/grip/}"
+ LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://buildd.emdebian.org/grip/}"
;;
progress)
- LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.debian.net/debian/}"
+ LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://cdn.debian.net/debian/}"
;;
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
- LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}"
+ LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}"
;;
*)
- LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://ports.ubuntu.com/}"
+ LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ports.ubuntu.com/}"
;;
esac
;;
esac
- LB_MIRROR_CHROOT="${LB_MIRROR_CHROOT:-${LB_MIRROR_BOOTSTRAP}}"
+ LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT:-${LB_PARENT_MIRROR_BOOTSTRAP}}"
# Setting security mirror to fetch packages from
case "${LB_MODE}" in
debian)
- LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
;;
emdebian)
- LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-none}"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-none}"
;;
progress)
- LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://cdn.debian.net/debian-security/}"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://cdn.debian.net/debian-security/}"
;;
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
- LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}"
;;
*)
- LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://ports.ubuntu.com/}"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://ports.ubuntu.com/}"
;;
esac
;;
@@ -350,55 +350,55 @@ Set_defaults ()
# Setting volatile mirror to fetch packages from
case "${LB_MODE}" in
debian|progress)
- LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-${LB_MIRROR_CHROOT}}"
+ LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-${LB_PARENT_MIRROR_CHROOT}}"
;;
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
- LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-http://security.ubuntu.com/ubuntu/}"
+ LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-http://security.ubuntu.com/ubuntu/}"
;;
*)
- LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-http://ports.ubuntu.com/}"
+ LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-http://ports.ubuntu.com/}"
;;
esac
;;
*)
- LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-none}"
+ LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-none}"
;;
esac
# Setting backports mirror to fetch packages from
case "${LB_MODE}" in
debian)
- LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-http://backports.debian.org/debian-backports/}"
+ LB_PARENT_MIRROR_CHROOT_BACKPORTS="${LB_PARENT_MIRROR_CHROOT_BACKPORTS:-http://backports.debian.org/debian-backports/}"
;;
*)
- LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-none}"
+ LB_PARENT_MIRROR_CHROOT_BACKPORTS="${LB_PARENT_MIRROR_CHROOT_BACKPORTS:-none}"
;;
esac
# Setting mirror which ends up in the image
case "${LB_MODE}" in
debian|progress)
- LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://cdn.debian.net/debian/}"
+ LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://cdn.debian.net/debian/}"
;;
emdebian)
- LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://buildd.emdebian.org/grip/}"
+ LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://buildd.emdebian.org/grip/}"
;;
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
- LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}"
+ LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}"
;;
*)
- LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://ports.ubuntu.com/}"
+ LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://ports.ubuntu.com/}"
;;
esac
;;
@@ -407,25 +407,25 @@ Set_defaults ()
# Setting security mirror which ends up in the image
case "${LB_MODE}" in
debian)
- LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.debian.org/}"
+ LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://security.debian.org/}"
;;
emdebian)
- LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-none}"
+ LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-none}"
;;
progress)
- LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://cdn.debian.net/debian-security/}"
+ LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://cdn.debian.net/debian-security/}"
;;
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
- LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://archive.ubuntu.com/ubuntu/}"
+ LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://archive.ubuntu.com/ubuntu/}"
;;
*)
- LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://ports.ubuntu.com/}"
+ LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://ports.ubuntu.com/}"
;;
esac
;;
@@ -434,38 +434,38 @@ Set_defaults ()
# Setting volatile mirror which ends up in the image
case "${LB_MODE}" in
debian|progress)
- LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE:-${LB_MIRROR_BINARY}}"
+ LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-${LB_PARENT_MIRROR_BINARY}}"
;;
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
- LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE:-http://security.ubuntu.com/ubuntu/}"
+ LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-http://security.ubuntu.com/ubuntu/}"
;;
*)
- LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE:-http://ports.ubuntu.com/}"
+ LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-http://ports.ubuntu.com/}"
;;
esac
;;
*)
- LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE:-none}"
+ LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-none}"
;;
esac
# Setting backports mirror which ends up in the image
case "${LB_MODE}" in
debian)
- LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-http://backports.debian.org/debian-backports/}"
+ LB_PARENT_MIRROR_BINARY_BACKPORTS="${LB_PARENT_MIRROR_BINARY_BACKPORTS:-http://backports.debian.org/debian-backports/}"
;;
*)
- LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-none}"
+ LB_PARENT_MIRROR_BINARY_BACKPORTS="${LB_PARENT_MIRROR_BINARY_BACKPORTS:-none}"
;;
esac
- LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_BOOTSTRAP}}"
+ LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_PARENT_MIRROR_BOOTSTRAP}}"
if [ -z "${LB_REPOSITORIES}" ]
then
@@ -710,7 +710,7 @@ Set_defaults ()
LB_TASKS="$(echo ${LB_TASKS} | sed -e 's| ||g')"
# Setting security updates option
- if [ "${LB_MIRROR_CHROOT_SECURITY}" = "none" ] || [ "${LB_MIRROR_BINARY_SECURITY}" = "none" ]
+ if [ "${LB_PARENT_MIRROR_CHROOT_SECURITY}" = "none" ] || [ "${LB_PARENT_MIRROR_BINARY_SECURITY}" = "none" ]
then
LB_SECURITY="false"
fi
@@ -718,7 +718,7 @@ Set_defaults ()
LB_SECURITY="${LB_SECURITY:-true}"
# Setting volatile updates option
- if [ "${LB_MIRROR_CHROOT_VOLATILE}" = "none" ] || [ "${LB_MIRROR_BINARY_VOLATILE}" = "none" ]
+ if [ "${LB_PARENT_MIRROR_CHROOT_VOLATILE}" = "none" ] || [ "${LB_PARENT_MIRROR_BINARY_VOLATILE}" = "none" ]
then
LB_VOLATILE="false"
fi
diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 8d7a59f..cf3ff78 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -142,25 +142,25 @@
.br
[\fB\-\-memtest\fP memtest86+|memtest86|none]
.br
- [\-m|\fB\-\-mirror\-bootstrap\fP \fIURL\fP]
+ [\-m|\fB\-\-parent\-mirror\-bootstrap\fP \fIURL\fP]
.br
- [\fB\-\-mirror\-chroot\fP \fIURL\fP]
+ [\fB\-\-parent\-mirror\-chroot\fP \fIURL\fP]
.br
- [\fB\-\-mirror\-chroot\-security\fP \fIURL\fP]
+ [\fB\-\-parent\-mirror\-chroot\-security\fP \fIURL\fP]
.br
- [\fB\-\-mirror\-chroot\-volatile\fP \fIURL\fP]
+ [\fB\-\-parent\-mirror\-chroot\-volatile\fP \fIURL\fP]
.br
- [\fB\-\-mirror\-chroot\-backports\fP \fIURL\fP]
+ [\fB\-\-parent\-mirror\-chroot\-backports\fP \fIURL\fP]
.br
- [\fB\-\-mirror\-binary\fP \fIURL\fP]
+ [\fB\-\-parent\-mirror\-binary\fP \fIURL\fP]
.br
- [\fB\-\-mirror\-binary\-security\fP \fIURL\fP]
+ [\fB\-\-parent\-mirror\-binary\-security\fP \fIURL\fP]
.br
- [\fB\-\-mirror\-binary\-volatile\fP \fIURL\fP]
+ [\fB\-\-parent\-mirror\-binary\-volatile\fP \fIURL\fP]
.br
- [\fB\-\-mirror\-binary\-backports\fP \fIURL\fP]
+ [\fB\-\-parent\-mirror\-binary\-backports\fP \fIURL\fP]
.br
- [\fB\-\-mirror\-debian\-installer\fP \fIURL\fP]
+ [\fB\-\-parent\-mirror\-debian\-installer\fP \fIURL\fP]
.br
[\fB\-\-mode\fP debian|emdebian|ubuntu]
.br
@@ -556,48 +556,48 @@ used. This is autodetected and does generally not need any customization.
defines if memtest, memtest86+ or no memory tester at all should be included
as secondary bootloader configuration. This is only available on amd64 and
i386 and defaults to memtest86+.
-.IP "\-m|\fB\-\-mirror\-bootstrap\fP \fIURL\fP" 4
+.IP "\-m|\fB\-\-parent\-mirror\-bootstrap\fP \fIURL\fP" 4
sets the location of the debian package mirror that should be used to
bootstrap from. This defaults to http://ftp.de.debian.org/debian/ which may
not be a good default if you live outside of Europe.
-.IP "\fB\-\-mirror\-chroot\fP \fIURL\fP" 4
+.IP "\fB\-\-parent\-mirror\-chroot\fP \fIURL\fP" 4
sets the location of the debian package mirror that will be used to fetch
the packages in order to build the live system. By default, this is set to
-the value of \-\-mirror\-bootstrap.
-.IP "\fB\-\-mirror\-chroot\-security\fP \fIURL\fP" 4
+the value of \-\-parent\-mirror\-bootstrap.
+.IP "\fB\-\-parent\-mirror\-chroot\-security\fP \fIURL\fP" 4
sets the location of the debian security package mirror that will be used to
fetch the packages in order to build the live system. By default, this
points to http://security.debian.org/debian/.
-.IP "\fB\-\-mirror\-chroot\-volatile\fP \fIURL\fP" 4
+.IP "\fB\-\-parent\-mirror\-chroot\-volatile\fP \fIURL\fP" 4
sets the location of the debian volatile package mirror that will be used to
fetch packages in order to build the live system. By default, this is set to
-the value of \-\-mirror\-chroot.
-.IP "\fB\-\-mirror\-chroot\-backports\fP \fIURL\fP" 4
+the value of \-\-parent\-mirror\-chroot.
+.IP "\fB\-\-parent\-mirror\-chroot\-backports\fP \fIURL\fP" 4
sets the location of the debian backports package mirror that will be used
to fetch packages in order to build the live system. By default, this points
to http://backports.debian.org/debian\-backports/.
-.IP "\fB\-\-mirror\-binary\fP \fIURL\fP" 4
+.IP "\fB\-\-parent\-mirror\-binary\fP \fIURL\fP" 4
sets the location of the debian package mirror that should end up configured
in the final image and which is the one a user would see and use. This has
not necessarily to be the same that is used to build the image, e.g. if you
use a local mirror but want to have an official mirror in the image. By
default, 'http://cdn.debian.net/debian/' is used.
-.IP "\fB\-\-mirror\-binary\-security\fP \fIURL\fP" 4
+.IP "\fB\-\-parent\-mirror\-binary\-security\fP \fIURL\fP" 4
sets the location of the debian security package mirror that should end up
configured in the final image. By default,
\&'http://cdn.debian.net/debian\-security/' is used.
-.IP "\fB\-\-mirror\-binary\-volatile\fP \fIURL\fP" 4
+.IP "\fB\-\-parent\-mirror\-binary\-volatile\fP \fIURL\fP" 4
sets the location of the debian volatile package mirror that should end up
-configured in the final image. By default, the value of \-\-mirror\-binary is
-used.
-.IP "\fB\-\-mirror\-binary\-backports\fP \fIURL\fP" 4
+configured in the final image. By default, the value of
+\-\-parent\-mirror\-binary is used.
+.IP "\fB\-\-parent\-mirror\-binary\-backports\fP \fIURL\fP" 4
sets the location of the debian backports package mirror that should end up
configured in the final image. By default,
\&'http://backports.debian.org/debian\-backports/' is used.
-.IP "\fB\-\-mirror\-debian\-installer\fP \fIURL\fP" 4
+.IP "\fB\-\-parent\-mirror\-debian\-installer\fP \fIURL\fP" 4
sets the location of the mirror that will be used to fetch the debian
installer images. By default, this points to the same mirror used to build
-the live system, i.e. the value of \-\-mirror\-bootstrap.
+the live system, i.e. the value of \-\-parent\-mirror\-bootstrap.
.IP "\fB\-\-mode\fP debian|emdebian|ubuntu" 4
defines a global mode to load project specific defaults. By default this is
set to debian.
@@ -743,8 +743,9 @@ GZIP_OPTIONS, no LB_ prefix is used.
.IP "\fB/etc/live/build.conf, /etc/live/build.d\fP" 4
.\" FIXME
An optional, global configuration file for \fBlb config\fP variables. It is
-useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This
-feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fP option.
+useful to specify a few system wide defaults, like
+LB_PARENT_MIRROR_BOOTSTRAP. This feature can be false by specifying the
+\fB\-\-ignore\-system\-defaults\fP option.
.SH "SEE ALSO"
\fIlive\-build\fP(7)
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index d172831..e178b47 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -137,25 +137,25 @@
.br
[\fB\-\-memtest\fR memtest86+|memtest86|none]
.br
- [\-m|\fB\-\-mirror\-bootstrap\fR \fIURL\fR]
+ [\-m|\fB\-\-parent\-mirror\-bootstrap\fR \fIURL\fR]
.br
- [\fB\-\-mirror\-chroot\fR \fIURL\fR]
+ [\fB\-\-parent\-mirror\-chroot\fR \fIURL\fR]
.br
- [\fB\-\-mirror\-chroot\-security\fR \fIURL\fR]
+ [\fB\-\-parent\-mirror\-chroot\-security\fR \fIURL\fR]
.br
- [\fB\-\-mirror\-chroot\-volatile\fR \fIURL\fR]
+ [\fB\-\-parent\-mirror\-chroot\-volatile\fR \fIURL\fR]
.br
- [\fB\-\-mirror\-chroot\-backports\fR \fIURL\fR]
+ [\fB\-\-parent\-mirror\-chroot\-backports\fR \fIURL\fR]
.br
- [\fB\-\-mirror\-binary\fR \fIURL\fR]
+ [\fB\-\-parent\-mirror\-binary\fR \fIURL\fR]
.br
- [\fB\-\-mirror\-binary\-security\fR \fIURL\fR]
+ [\fB\-\-parent\-mirror\-binary\-security\fR \fIURL\fR]
.br
- [\fB\-\-mirror\-binary\-volatile\fR \fIURL\fR]
+ [\fB\-\-parent\-mirror\-binary\-volatile\fR \fIURL\fR]
.br
- [\fB\-\-mirror\-binary\-backports\fR \fIURL\fR]
+ [\fB\-\-parent\-mirror\-binary\-backports\fR \fIURL\fR]
.br
- [\fB\-\-mirror\-debian\-installer\fR \fIURL\fR]
+ [\fB\-\-parent\-mirror\-debian\-installer\fR \fIURL\fR]
.br
[\fB\-\-mode\fR debian|emdebian|ubuntu]
.br
@@ -363,26 +363,26 @@ sets the internal name of the kernel packages naming scheme. If you use debian k
sets the filename of the losetup binary from the host system that should be used. This is autodetected and does generally not need any customization.
.IP "\fB\-\-memtest\fR memtest86+|memtest86|none" 4
defines if memtest, memtest86+ or no memory tester at all should be included as secondary bootloader configuration. This is only available on amd64 and i386 and defaults to memtest86+.
-.IP "\-m|\fB\-\-mirror\-bootstrap\fR \fIURL\fR" 4
+.IP "\-m|\fB\-\-parent\-mirror\-bootstrap\fR \fIURL\fR" 4
sets the location of the debian package mirror that should be used to bootstrap from. This defaults to http://ftp.de.debian.org/debian/ which may not be a good default if you live outside of Europe.
-.IP "\fB\-\-mirror\-chroot\fR \fIURL\fR" 4
-sets the location of the debian package mirror that will be used to fetch the packages in order to build the live system. By default, this is set to the value of \-\-mirror\-bootstrap.
-.IP "\fB\-\-mirror\-chroot\-security\fR \fIURL\fR" 4
+.IP "\fB\-\-parent\-mirror\-chroot\fR \fIURL\fR" 4
+sets the location of the debian package mirror that will be used to fetch the packages in order to build the live system. By default, this is set to the value of \-\-parent\-mirror\-bootstrap.
+.IP "\fB\-\-parent\-mirror\-chroot\-security\fR \fIURL\fR" 4
sets the location of the debian security package mirror that will be used to fetch the packages in order to build the live system. By default, this points to http://security.debian.org/debian/.
-.IP "\fB\-\-mirror\-chroot\-volatile\fR \fIURL\fR" 4
-sets the location of the debian volatile package mirror that will be used to fetch packages in order to build the live system. By default, this is set to the value of \-\-mirror\-chroot.
-.IP "\fB\-\-mirror\-chroot\-backports\fR \fIURL\fR" 4
+.IP "\fB\-\-parent\-mirror\-chroot\-volatile\fR \fIURL\fR" 4
+sets the location of the debian volatile package mirror that will be used to fetch packages in order to build the live system. By default, this is set to the value of \-\-parent\-mirror\-chroot.
+.IP "\fB\-\-parent\-mirror\-chroot\-backports\fR \fIURL\fR" 4
sets the location of the debian backports package mirror that will be used to fetch packages in order to build the live system. By default, this points to http://backports.debian.org/debian-backports/.
-.IP "\fB\-\-mirror\-binary\fR \fIURL\fR" 4
+.IP "\fB\-\-parent\-mirror\-binary\fR \fIURL\fR" 4
sets the location of the debian package mirror that should end up configured in the final image and which is the one a user would see and use. This has not necessarily to be the same that is used to build the image, e.g. if you use a local mirror but want to have an official mirror in the image. By default, 'http://cdn.debian.net/debian/' is used.
-.IP "\fB\-\-mirror\-binary\-security\fR \fIURL\fR" 4
+.IP "\fB\-\-parent\-mirror\-binary\-security\fR \fIURL\fR" 4
sets the location of the debian security package mirror that should end up configured in the final image. By default, 'http://cdn.debian.net/debian-security/' is used.
-.IP "\fB\-\-mirror\-binary\-volatile\fR \fIURL\fR" 4
-sets the location of the debian volatile package mirror that should end up configured in the final image. By default, the value of \-\-mirror\-binary is used.
-.IP "\fB\-\-mirror\-binary\-backports\fR \fIURL\fR" 4
+.IP "\fB\-\-parent\-mirror\-binary\-volatile\fR \fIURL\fR" 4
+sets the location of the debian volatile package mirror that should end up configured in the final image. By default, the value of \-\-parent\-mirror\-binary is used.
+.IP "\fB\-\-parent\-mirror\-binary\-backports\fR \fIURL\fR" 4
sets the location of the debian backports package mirror that should end up configured in the final image. By default, 'http://backports.debian.org/debian-backports/' is used.
-.IP "\fB\-\-mirror\-debian\-installer\fR \fIURL\fR" 4
-sets the location of the mirror that will be used to fetch the debian installer images. By default, this points to the same mirror used to build the live system, i.e. the value of \-\-mirror\-bootstrap.
+.IP "\fB\-\-parent\-mirror\-debian\-installer\fR \fIURL\fR" 4
+sets the location of the mirror that will be used to fetch the debian installer images. By default, this points to the same mirror used to build the live system, i.e. the value of \-\-parent\-mirror\-bootstrap.
.IP "\fB\-\-mode\fR debian|emdebian|ubuntu" 4
defines a global mode to load project specific defaults. By default this is set to debian.
.IP "\fB\-\-net\-root\-filesystem\fR nfs|cfs" 4
@@ -467,7 +467,7 @@ Currently, command line switches can also be specified through the corresponding
.\" FIXME
.IP "\fBauto/config\fR" 4
.IP "\fB/etc/live/build.conf, /etc/live/build.d\fR" 4
-An optional, global configuration file for \fBlb config\fR variables. It is useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fR option.
+An optional, global configuration file for \fBlb config\fR variables. It is useful to specify a few system wide defaults, like LB_PARENT_MIRROR_BOOTSTRAP. This feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fR option.
.\" FIXME
.SH SEE ALSO
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index 9943118..33472a1 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2011-02-14 12:33+0100\n"
+"POT-Creation-Date: 2011-02-14 13:10+0100\n"
"PO-Revision-Date: 2011-01-02 01:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -1005,52 +1005,52 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:141
-msgid " [-m|B<--mirror-bootstrap> I<URL>]"
+msgid " [-m|B<--parent-mirror-bootstrap> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:143
-msgid " [B<--mirror-chroot> I<URL>]"
+msgid " [B<--parent-mirror-chroot> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:145
-msgid " [B<--mirror-chroot-security> I<URL>]"
+msgid " [B<--parent-mirror-chroot-security> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:147
-msgid " [B<--mirror-chroot-volatile> I<URL>]"
+msgid " [B<--parent-mirror-chroot-volatile> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:149
-msgid " [B<--mirror-chroot-backports> I<URL>]"
+msgid " [B<--parent-mirror-chroot-backports> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:151
-msgid " [B<--mirror-binary> I<URL>]"
+msgid " [B<--parent-mirror-binary> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:153
-msgid " [B<--mirror-binary-security> I<URL>]"
+msgid " [B<--parent-mirror-binary-security> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:155
-msgid " [B<--mirror-binary-volatile> I<URL>]"
+msgid " [B<--parent-mirror-binary-volatile> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:157
-msgid " [B<--mirror-binary-backports> I<URL>]"
+msgid " [B<--parent-mirror-binary-backports> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:159
-msgid " [B<--mirror-debian-installer> I<URL>]"
+msgid " [B<--parent-mirror-debian-installer> I<URL>]"
msgstr ""
#. type: Plain text
@@ -2182,7 +2182,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:366
#, no-wrap
-msgid "-m|B<--mirror-bootstrap> I<URL>"
+msgid "-m|B<--parent-mirror-bootstrap> I<URL>"
msgstr ""
#. type: Plain text
@@ -2196,7 +2196,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:368
#, no-wrap
-msgid "B<--mirror-chroot> I<URL>"
+msgid "B<--parent-mirror-chroot> I<URL>"
msgstr ""
#. type: Plain text
@@ -2204,13 +2204,13 @@ msgstr ""
msgid ""
"sets the location of the debian package mirror that will be used to fetch "
"the packages in order to build the live system. By default, this is set to "
-"the value of --mirror-bootstrap."
+"the value of --parent-mirror-bootstrap."
msgstr ""
#. type: IP
#: en/lb_config.1:370
#, no-wrap
-msgid "B<--mirror-chroot-security> I<URL>"
+msgid "B<--parent-mirror-chroot-security> I<URL>"
msgstr ""
#. type: Plain text
@@ -2224,7 +2224,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:372
#, no-wrap
-msgid "B<--mirror-chroot-volatile> I<URL>"
+msgid "B<--parent-mirror-chroot-volatile> I<URL>"
msgstr ""
#. type: Plain text
@@ -2232,13 +2232,13 @@ msgstr ""
msgid ""
"sets the location of the debian volatile package mirror that will be used to "
"fetch packages in order to build the live system. By default, this is set to "
-"the value of --mirror-chroot."
+"the value of --parent-mirror-chroot."
msgstr ""
#. type: IP
#: en/lb_config.1:374
#, no-wrap
-msgid "B<--mirror-chroot-backports> I<URL>"
+msgid "B<--parent-mirror-chroot-backports> I<URL>"
msgstr ""
#. type: Plain text
@@ -2252,7 +2252,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:376
#, no-wrap
-msgid "B<--mirror-binary> I<URL>"
+msgid "B<--parent-mirror-binary> I<URL>"
msgstr ""
#. type: Plain text
@@ -2268,7 +2268,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:378
#, no-wrap
-msgid "B<--mirror-binary-security> I<URL>"
+msgid "B<--parent-mirror-binary-security> I<URL>"
msgstr ""
#. type: Plain text
@@ -2282,21 +2282,21 @@ msgstr ""
#. type: IP
#: en/lb_config.1:380
#, no-wrap
-msgid "B<--mirror-binary-volatile> I<URL>"
+msgid "B<--parent-mirror-binary-volatile> I<URL>"
msgstr ""
#. type: Plain text
#: en/lb_config.1:382
msgid ""
"sets the location of the debian volatile package mirror that should end up "
-"configured in the final image. By default, the value of --mirror-binary is "
-"used."
+"configured in the final image. By default, the value of --parent-mirror-"
+"binary is used."
msgstr ""
#. type: IP
#: en/lb_config.1:382
#, no-wrap
-msgid "B<--mirror-binary-backports> I<URL>"
+msgid "B<--parent-mirror-binary-backports> I<URL>"
msgstr ""
#. type: Plain text
@@ -2310,7 +2310,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:384
#, no-wrap
-msgid "B<--mirror-debian-installer> I<URL>"
+msgid "B<--parent-mirror-debian-installer> I<URL>"
msgstr ""
#. type: Plain text
@@ -2318,7 +2318,7 @@ msgstr ""
msgid ""
"sets the location of the mirror that will be used to fetch the debian "
"installer images. By default, this points to the same mirror used to build "
-"the live system, i.e. the value of --mirror-bootstrap."
+"the live system, i.e. the value of --parent-mirror-bootstrap."
msgstr ""
#. type: IP
@@ -2817,6 +2817,7 @@ msgstr ""
#: en/lb_config.1:472
msgid ""
"An optional, global configuration file for B<lb config> variables. It is "
-"useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This "
-"feature can be false by specifying the B<--ignore-system-defaults> option."
+"useful to specify a few system wide defaults, like "
+"LB_PARENT_MIRROR_BOOTSTRAP. This feature can be false by specifying the B<--"
+"ignore-system-defaults> option."
msgstr ""
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index c817fb5..b12c326 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2011-02-14 12:33+0100\n"
+"POT-Creation-Date: 2011-02-14 13:10+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1005,52 +1005,52 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:141
-msgid " [-m|B<--mirror-bootstrap> I<URL>]"
+msgid " [-m|B<--parent-mirror-bootstrap> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:143
-msgid " [B<--mirror-chroot> I<URL>]"
+msgid " [B<--parent-mirror-chroot> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:145
-msgid " [B<--mirror-chroot-security> I<URL>]"
+msgid " [B<--parent-mirror-chroot-security> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:147
-msgid " [B<--mirror-chroot-volatile> I<URL>]"
+msgid " [B<--parent-mirror-chroot-volatile> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:149
-msgid " [B<--mirror-chroot-backports> I<URL>]"
+msgid " [B<--parent-mirror-chroot-backports> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:151
-msgid " [B<--mirror-binary> I<URL>]"
+msgid " [B<--parent-mirror-binary> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:153
-msgid " [B<--mirror-binary-security> I<URL>]"
+msgid " [B<--parent-mirror-binary-security> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:155
-msgid " [B<--mirror-binary-volatile> I<URL>]"
+msgid " [B<--parent-mirror-binary-volatile> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:157
-msgid " [B<--mirror-binary-backports> I<URL>]"
+msgid " [B<--parent-mirror-binary-backports> I<URL>]"
msgstr ""
#. type: Plain text
#: en/lb_config.1:159
-msgid " [B<--mirror-debian-installer> I<URL>]"
+msgid " [B<--parent-mirror-debian-installer> I<URL>]"
msgstr ""
#. type: Plain text
@@ -2182,7 +2182,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:366
#, no-wrap
-msgid "-m|B<--mirror-bootstrap> I<URL>"
+msgid "-m|B<--parent-mirror-bootstrap> I<URL>"
msgstr ""
#. type: Plain text
@@ -2196,7 +2196,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:368
#, no-wrap
-msgid "B<--mirror-chroot> I<URL>"
+msgid "B<--parent-mirror-chroot> I<URL>"
msgstr ""
#. type: Plain text
@@ -2204,13 +2204,13 @@ msgstr ""
msgid ""
"sets the location of the debian package mirror that will be used to fetch "
"the packages in order to build the live system. By default, this is set to "
-"the value of --mirror-bootstrap."
+"the value of --parent-mirror-bootstrap."
msgstr ""
#. type: IP
#: en/lb_config.1:370
#, no-wrap
-msgid "B<--mirror-chroot-security> I<URL>"
+msgid "B<--parent-mirror-chroot-security> I<URL>"
msgstr ""
#. type: Plain text
@@ -2224,7 +2224,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:372
#, no-wrap
-msgid "B<--mirror-chroot-volatile> I<URL>"
+msgid "B<--parent-mirror-chroot-volatile> I<URL>"
msgstr ""
#. type: Plain text
@@ -2232,13 +2232,13 @@ msgstr ""
msgid ""
"sets the location of the debian volatile package mirror that will be used to "
"fetch packages in order to build the live system. By default, this is set to "
-"the value of --mirror-chroot."
+"the value of --parent-mirror-chroot."
msgstr ""
#. type: IP
#: en/lb_config.1:374
#, no-wrap
-msgid "B<--mirror-chroot-backports> I<URL>"
+msgid "B<--parent-mirror-chroot-backports> I<URL>"
msgstr ""
#. type: Plain text
@@ -2252,7 +2252,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:376
#, no-wrap
-msgid "B<--mirror-binary> I<URL>"
+msgid "B<--parent-mirror-binary> I<URL>"
msgstr ""
#. type: Plain text
@@ -2268,7 +2268,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:378
#, no-wrap
-msgid "B<--mirror-binary-security> I<URL>"
+msgid "B<--parent-mirror-binary-security> I<URL>"
msgstr ""
#. type: Plain text
@@ -2282,21 +2282,21 @@ msgstr ""
#. type: IP
#: en/lb_config.1:380
#, no-wrap
-msgid "B<--mirror-binary-volatile> I<URL>"
+msgid "B<--parent-mirror-binary-volatile> I<URL>"
msgstr ""
#. type: Plain text
#: en/lb_config.1:382
msgid ""
"sets the location of the debian volatile package mirror that should end up "
-"configured in the final image. By default, the value of --mirror-binary is "
-"used."
+"configured in the final image. By default, the value of --parent-mirror-"
+"binary is used."
msgstr ""
#. type: IP
#: en/lb_config.1:382
#, no-wrap
-msgid "B<--mirror-binary-backports> I<URL>"
+msgid "B<--parent-mirror-binary-backports> I<URL>"
msgstr ""
#. type: Plain text
@@ -2310,7 +2310,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:384
#, no-wrap
-msgid "B<--mirror-debian-installer> I<URL>"
+msgid "B<--parent-mirror-debian-installer> I<URL>"
msgstr ""
#. type: Plain text
@@ -2318,7 +2318,7 @@ msgstr ""
msgid ""
"sets the location of the mirror that will be used to fetch the debian "
"installer images. By default, this points to the same mirror used to build "
-"the live system, i.e. the value of --mirror-bootstrap."
+"the live system, i.e. the value of --parent-mirror-bootstrap."
msgstr ""
#. type: IP
@@ -2817,6 +2817,7 @@ msgstr ""
#: en/lb_config.1:472
msgid ""
"An optional, global configuration file for B<lb config> variables. It is "
-"useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This "
-"feature can be false by specifying the B<--ignore-system-defaults> option."
+"useful to specify a few system wide defaults, like "
+"LB_PARENT_MIRROR_BOOTSTRAP. This feature can be false by specifying the B<--"
+"ignore-system-defaults> option."
msgstr ""
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index db1b236..d2f966e 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -262,7 +262,7 @@ then
;;
esac
else
- URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
+ URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
fi
mkdir -p "${DESTDIR_DI}"
@@ -484,13 +484,13 @@ then
gzip -9 -c binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Packages > binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Packages.gz
# Fetching release
- Download_file binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Release "${LB_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/binary-"${LB_ARCHITECTURES}"/Release
+ Download_file binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LB_ARCHITECTURES}/Release "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/binary-"${LB_ARCHITECTURES}"/Release
mkdir binary.udeb
cd binary.udeb
# Downloading udeb indices
- Download_file Packages.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz
+ Download_file Packages.gz "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz
gunzip -c Packages.gz > Packages
# Sorting udebs
@@ -505,7 +505,7 @@ then
cp ../cache/packages_debian-installer.udeb/"$(basename ${UDEB})" ./
else
# Downloading udebs
- wget ${WGET_OPTIONS} "${LB_MIRROR_CHROOT}"/${UDEB}
+ wget ${WGET_OPTIONS} "${LB_PARENT_MIRROR_CHROOT}"/${UDEB}
fi
done
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index d556dda..145a0c2 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -74,7 +74,7 @@ esac
if [ -n "${TRACE}" ]
then
- echo "$(wget -q ${LB_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
+ echo "$(wget -q ${LB_PARENT_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
> binary/.disk/archive_trace
fi
diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index 9dc2de9..0c621cd 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/lb_bootstrap_cdebootstrap
@@ -131,7 +131,7 @@ then
fi
Echo_breakage "Running ${LB_BOOTSTRAP} (download-only)... "
- ${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}"
+ ${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
if [ -n "${LB_ROOT_COMMAND}" ]
then
@@ -147,7 +147,7 @@ then
fi
Echo_breakage "Running ${LB_BOOTSTRAP}... "
- ${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}"
+ ${LB_ROOT_COMMAND} ${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
if [ -n "${LB_ROOT_COMMAND}" ]
then
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index 9bc7cd2..ba5ad2e 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -124,7 +124,7 @@ then
fi
Echo_breakage "Running debootstrap (download-only)... "
- ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
+ ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
if [ -n "${LB_ROOT_COMMAND}" ]
then
@@ -140,7 +140,7 @@ then
fi
Echo_breakage "Running debootstrap... "
- ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
+ ${LB_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" "${LB_DEBOOTSTRAP_SCRIPT}"
if [ -n "${LB_ROOT_COMMAND}" ]
then
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index d5c51ab..e41cf5b 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -50,34 +50,34 @@ case "${1}" in
cat > chroot/etc/apt/sources.list << EOF
# /etc/apt/sources.list
-deb ${LB_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}
+deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}
EOF
if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LB_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
if [ "${LB_SECURITY}" = "true" ]
then
case "${LB_MODE}" in
ubuntu)
- echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
*)
if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] && [ "${LB_PARENT_DISTRIBUTION}" != "unstable" ]
then
- echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
;;
@@ -88,11 +88,11 @@ EOF
then
case "${LB_MODE}" in
debian|ubuntu)
- echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
esac
@@ -104,11 +104,11 @@ EOF
debian)
if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] && [ "${LB_PARENT_DISTRIBUTION}" != "unstable" ]
then
- echo "deb ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_PARENT_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_PARENT_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
;;
@@ -465,8 +465,8 @@ EOF
# Configure generic indices
# Don't do anything if it's not required
- if [ "${LB_MIRROR_CHROOT}" = "${LB_MIRROR_BINARY}" ] && \
- [ "${LB_MIRROR_CHROOT_SECURITY}" = "${LB_MIRROR_BINARY_SECURITY}" ] && \
+ if [ "${LB_PARENT_MIRROR_CHROOT}" = "${LB_PARENT_MIRROR_BINARY}" ] && \
+ [ "${LB_PARENT_MIRROR_CHROOT_SECURITY}" = "${LB_PARENT_MIRROR_BINARY_SECURITY}" ] && \
[ ! -d chroot/root/local-packages ]
then
# Removing stage file
@@ -482,34 +482,34 @@ EOF
cat > chroot/etc/apt/sources.list << EOF
# /etc/apt/sources.list
-deb ${LB_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}
+deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}
EOF
if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LB_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
if [ "${LB_SECURITY}" = "true" ]
then
case "${LB_MODE}" in
ubuntu)
- echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
*)
if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] && [ "${LB_PARENT_DISTRIBUTION}" != "unstable" ]
then
- echo "deb ${LB_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
;;
@@ -520,11 +520,11 @@ EOF
then
case "${LB_MODE}" in
debian|ubuntu)
- echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_PARENT_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_PARENT_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
esac
@@ -536,11 +536,11 @@ EOF
debian)
if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] && [ "${LB_PARENT_DISTRIBUTION}" != "unstable" ]
then
- echo "deb ${LB_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LB_PARENT_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ]
then
- echo "deb-src ${LB_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LB_PARENT_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
;;
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 7b92fe4..2eb8f0a 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -93,16 +93,16 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--linux-packages \"PACKAGES\"]\n\
\t [--losetup losetup|losetup.orig]\n\
\t [--memtest memtest86+|memtest86|none]\n\
-\t [-m|--mirror-bootstrap URL]\n\
-\t [--mirror-chroot URL]\n\
-\t [--mirror-chroot-security URL]\n\
-\t [--mirror-chroot-volatile URL]\n\
-\t [--mirror-chroot-backports URL]\n\
-\t [--mirror-binary URL]\n\
-\t [--mirror-binary-security URL]\n\
-\t [--mirror-binary-volatile URL]\n\
-\t [--mirror-binary-backports URL]\n\
-\t [--mirror-debian-installer URL]\n\
+\t [-m|--parent-mirror-bootstrap URL]\n\
+\t [--parent-mirror-chroot URL]\n\
+\t [--parent-mirror-chroot-security URL]\n\
+\t [--parent-mirror-chroot-volatile URL]\n\
+\t [--parent-mirror-chroot-backports URL]\n\
+\t [--parent-mirror-binary URL]\n\
+\t [--parent-mirror-binary-security URL]\n\
+\t [--parent-mirror-binary-volatile URL]\n\
+\t [--parent-mirror-binary-backports URL]\n\
+\t [--parent-mirror-debian-installer URL]\n\
\t [--mode debian|emdebian|ubuntu]\n\
\t [--net-root-filesystem nfs|cfs]\n\
\t [--net-root-mountoptions OPTIONS]\n\
@@ -142,8 +142,8 @@ Local_arguments ()
cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
initramfs:,initsystem:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:,
templates:,architectures:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
- distribution:,parent-distribution:,parent-debian-installer-distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:,
- mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
+ distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-chroot-volatile:,parent-mirror-chroot-backports:,parent-mirror-binary:,
+ parent-mirror-binary-security:,parent-mirror-binary-volatile:,parent-mirror-binary-backports:,parent-mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
packages:,package-lists:,tasks:,security:,volatile:,backports:,binary-filesystem:,binary-images:,
apt-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,compression:,build-with-chroot:,
@@ -400,53 +400,53 @@ Local_arguments ()
shift 2
;;
- -m|--mirror-bootstrap)
- LB_MIRROR_BOOTSTRAP="${2}"
+ -m|--parent-mirror-bootstrap)
+ LB_PARENT_MIRROR_BOOTSTRAP="${2}"
shift 2
;;
- --mirror-chroot)
- LB_MIRROR_CHROOT="${2}"
+ --parent-mirror-chroot)
+ LB_PARENT_MIRROR_CHROOT="${2}"
shift 2
;;
- --mirror-chroot-security)
- LB_MIRROR_CHROOT_SECURITY="${2}"
+ --parent-mirror-chroot-security)
+ LB_PARENT_MIRROR_CHROOT_SECURITY="${2}"
shift 2
;;
- --mirror-chroot-volatile)
- LB_MIRROR_CHROOT_VOLATILE="${2}"
+ --parent-mirror-chroot-volatile)
+ LB_PARENT_MIRROR_CHROOT_VOLATILE="${2}"
shift 2
;;
- --mirror-chroot-backports)
- LB_MIRROR_CHROOT_BACKPORTS="${2}"
+ --parent-mirror-chroot-backports)
+ LB_PARENT_MIRROR_CHROOT_BACKPORTS="${2}"
shift 2
;;
- --mirror-binary)
- LB_MIRROR_BINARY="${2}"
+ --parent-mirror-binary)
+ LB_PARENT_MIRROR_BINARY="${2}"
shift 2
;;
- --mirror-binary-security)
- LB_MIRROR_BINARY_SECURITY="${2}"
+ --parent-mirror-binary-security)
+ LB_PARENT_MIRROR_BINARY_SECURITY="${2}"
shift 2
;;
- --mirror-binary-volatile)
- LB_MIRROR_BINARY_VOLATILE="${2}"
+ --parent-mirror-binary-volatile)
+ LB_PARENT_MIRROR_BINARY_VOLATILE="${2}"
shift 2
;;
- --mirror-binary-backports)
- LB_MIRROR_BINARY_BACKPORTS="${2}"
+ --parent-mirror-binary-backports)
+ LB_PARENT_MIRROR_BINARY_BACKPORTS="${2}"
shift 2
;;
- --mirror-debian-installer)
- LB_MIRROR_DEBIAN_INSTALLER="${2}"
+ --parent-mirror-debian-installer)
+ LB_PARENT_MIRROR_DEBIAN_INSTALLER="${2}"
shift 2
;;
@@ -993,45 +993,45 @@ LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
# (Default: ${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION})
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"
-# \$LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
-# (Default: ${LB_MIRROR_BOOTSTRAP})
-LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP}"
+# \$LB_PARENT_MIRROR_BOOTSTRAP: set parent mirror to bootstrap from
+# (Default: ${LB_PARENT_MIRROR_BOOTSTRAP})
+LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP}"
-# \$LB_MIRROR_CHROOT: set mirror to fetch packages from
-# (Default: ${LB_MIRROR_CHROOT})
-LB_MIRROR_CHROOT="${LB_MIRROR_CHROOT}"
+# \$LB_PARENT_MIRROR_CHROOT: set parent mirror to fetch packages from
+# (Default: ${LB_PARENT_MIRROR_CHROOT})
+LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT}"
-# \$LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
-# (Default: ${LB_MIRROR_CHROOT_SECURITY})
-LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY}"
+# \$LB_PARENT_MIRROR_CHROOT_SECURITY: set security parent mirror to fetch packages from
+# (Default: ${LB_PARENT_MIRROR_CHROOT_SECURITY})
+LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY}"
-# \$LB_MIRROR_CHROOT_VOLATILE: set volatile mirror to fetch packages from
-# (Default: ${LB_MIRROR_CHROOT_VOLATILE})
-LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE}"
+# \$LB_PARENT_MIRROR_CHROOT_VOLATILE: set volatile parent mirror to fetch packages from
+# (Default: ${LB_PARENT_MIRROR_CHROOT_VOLATILE})
+LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE}"
-# \$LB_MIRROR_CHROOT_BACKPORTS: set backports mirror to fetch packages from
-# (Default: ${LB_MIRROR_CHROOT_BACKPORTS})
-LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS}"
+# \$LB_PARENT_MIRROR_CHROOT_BACKPORTS: set backports parent mirror to fetch packages from
+# (Default: ${LB_PARENT_MIRROR_CHROOT_BACKPORTS})
+LB_PARENT_MIRROR_CHROOT_BACKPORTS="${LB_PARENT_MIRROR_CHROOT_BACKPORTS}"
-# \$LB_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: ${LB_MIRROR_BINARY})
-LB_MIRROR_BINARY="${LB_MIRROR_BINARY}"
+# \$LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image
+# (Default: ${LB_PARENT_MIRROR_BINARY})
+LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY}"
-# \$LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
-# (Default: ${LB_MIRROR_BINARY_SECURITY})
-LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}"
+# \$LB_PARENT_MIRROR_BINARY_SECURITY: set security parent mirror which ends up in the image
+# (Default: ${LB_PARENT_MIRROR_BINARY_SECURITY})
+LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY}"
-# \$LB_MIRROR_BINARY_VOLATILE: set volatile mirror which ends up in the image
-# (Default: ${LB_MIRROR_BINARY_VOLATILE})
-LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE}"
+# \$LB_PARENT_MIRROR_BINARY_VOLATILE: set volatile parent mirror which ends up in the image
+# (Default: ${LB_PARENT_MIRROR_BINARY_VOLATILE})
+LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE}"
-# \$LB_MIRROR_BINARY_BACKPORTS: set backports mirror which ends up in the image
-# (Default: ${LB_MIRROR_BINARY_BACKPORTS})
-LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS}"
+# \$LB_PARENT_MIRROR_BINARY_BACKPORTS: set backports parent mirror which ends up in the image
+# (Default: ${LB_PARENT_MIRROR_BINARY_BACKPORTS})
+LB_PARENT_MIRROR_BINARY_BACKPORTS="${LB_PARENT_MIRROR_BINARY_BACKPORTS}"
-# \$LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
-# (Default: ${LB_MIRROR_BOOTSTRAP})
-LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}"
+# \$LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror
+# (Default: ${LB_PARENT_MIRROR_BOOTSTRAP})
+LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}"
# \$LB_ARCHIVE_AREAS: select archive areas to use
# (Default: ${LB_ARCHIVE_AREAS})
diff --git a/scripts/build/lb_source_disk b/scripts/build/lb_source_disk
index f454cca..e88a92b 100755
--- a/scripts/build/lb_source_disk
+++ b/scripts/build/lb_source_disk
@@ -74,7 +74,7 @@ esac
if [ -n "${TRACE}" ]
then
- echo "$(wget -q ${LB_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
+ echo "$(wget -q ${LB_PARENT_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
> source/.disk/archive_trace
fi
--
live-build
More information about the debian-live-changes
mailing list