manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing bootstrap-keyring option.

This commit is contained in:
Daniel Baumann 2012-08-27 14:36:42 +02:00
parent fda74e4307
commit 9b5fc09d0f
7 changed files with 701 additions and 764 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
functions/defaults.sh
View File

@ -377,9 +377,6 @@ Set_defaults ()
fi
fi
# Setting bootstrap keyring
# LB_BOOTSTRAP_KEYRING
# Setting mirror to fetch packages from
case "${LB_MODE}" in
debian)

5
manpages/de/lb_config.de.1
View File

@ -47,8 +47,6 @@
[\fB\-\-bootloader\fP grub|syslinux|yaboot]
.br
[\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap|copy]
.br
[\fB\-\-bootstrap\-keyring\fP \fIPACKAGE\fP]
.br
[\fB\-\-cache\fP true|false]
.br
@ -352,9 +350,6 @@ debootstrap. Note that if you set the bootstrap program to copy, then your
host system is copied. This can be useful if you want to convert/clone your
existing host system into a live system, however, make sure you do have
enough free space as this can, depending on your host system, get quite big.
.IP "\fB\-\-bootstrap\-keyring\fP \fIPACKAGE\fP" 4
sets the archive keyring package to be used. Default is
debian\-archive\-keyring.
.IP "\fB\-\-cache\fP true|false" 4
defines globally if any cache should be used at all. Different caches can be
controled through the their own options.

4
manpages/en/lb_config.1
View File

@ -42,8 +42,6 @@
[\fB\-\-bootloader\fR grub|syslinux|yaboot]
.br
[\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap|copy]
.br
[\fB\-\-bootstrap\-keyring\fR \fIPACKAGE\fR]
.br
[\fB\-\-cache\fR true|false]
.br
@ -285,8 +283,6 @@ sets boot parameters specific to debian\-live. A complete list of boot parameter
defines which bootloader is beeing used in the generated image. This has only an effect if the selected binary image type does allow to choose the bootloader. For example, if you build a iso, always syslinux (or more precise, isolinux) is being used. Also note that some combinations of binary images types and bootloaders may be possible but live\-build does not support them yet. \fBlb config\fR will fail to create such a not yet supported configuration and give a explanation about it. For hdd images on amd64 and i386, the default is syslinux. yaboot is only used on powerpc.
.IP "\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap|copy" 4
defines which program is used to bootstrap the debian chroot, default is debootstrap. Note that if you set the bootstrap program to copy, then your host system is copied. This can be useful if you want to convert/clone your existing host system into a live system, however, make sure you do have enough free space as this can, depending on your host system, get quite big.
.IP "\fB\-\-bootstrap\-keyring\fR \fIPACKAGE\fR" 4
sets the archive keyring package to be used. Default is debian\-archive\-keyring.
.IP "\fB\-\-cache\fR true|false" 4
defines globally if any cache should be used at all. Different caches can be controled through the their own options.
.IP "\fB\-\-cache\-indices\fR true|false" 4

718
manpages/po/de/lb_config.1.po
View File

File diff suppressed because it is too large Load Diff

718
manpages/pot/lb_config.1.pot
View File

File diff suppressed because it is too large Load Diff

5
scripts/build/lb_bootstrap_cdebootstrap
View File

@ -61,11 +61,6 @@ then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
fi
if [ -n "${LB_BOOTSTRAP_KEYRING}" ]
then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LB_BOOTSTRAP_KEYRING}"
fi
if [ "${_DEBUG}" = "true" ]
then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"

12
scripts/build/lb_config
View File

@ -34,7 +34,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--bootappend-failsafe PARAMETER|\"PARAMETERS\"]\n\
\t [--bootloader grub|syslinux|yaboot]\n\
\t [--bootstrap cdebootstrap|cdebootstrap-static|debootstrap|copy]\n\
\t [--bootstrap-keyring PACKAGE]\n\
\t [--cache true|false]\n\
\t [--cache-indices true|false]\n\
\t [--cache-packages true|false]\n\
@ -145,7 +144,7 @@ Local_arguments ()
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:,
templates:,architectures:,bootstrap-keyring:,clean,
templates:,architectures:,clean,
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:,
mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:,
@ -370,11 +369,6 @@ Local_arguments ()
shift 2
;;
--bootstrap-keyring)
LB_BOOTSTRAP_KEYRING="${2}"
shift 2
;;
-d|--distribution)
LB_DISTRIBUTION="${2}"
shift 2
@ -1093,10 +1087,6 @@ cat > config/bootstrap << EOF
# (Default: autodetected)
LB_ARCHITECTURES="${LB_ARCHITECTURES}"
# \$LB_BOOTSTRAP_KEYRING: set distribution keyring
# (Default: empty)
LB_BOOTSTRAP_KEYRING="${LB_BOOTSTRAP_KEYRING}"
# \$LB_DISTRIBUTION: select distribution to use
# (Default: ${LB_DISTRIBUTION})
LB_DISTRIBUTION="${LB_DISTRIBUTION}"