diff options
| -rwxr-xr-x | functions/defaults.sh | 58 | ||||
| -rwxr-xr-x | scripts/build/chroot_archives | 20 | ||||
| -rwxr-xr-x | scripts/build/config | 48 |
3 files changed, 14 insertions, 112 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 7ac98a9eb..352e51d11 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -429,33 +429,6 @@ Set_defaults () ;; esac - # Setting updates mirror to fetch packages from - case "${LB_MODE}" in - debian|progress-linux) - LB_PARENT_MIRROR_CHROOT_UPDATES="${LB_PARENT_MIRROR_CHROOT_UPDATES:-${LB_PARENT_MIRROR_CHROOT}}" - LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-${LB_MIRROR_CHROOT}}" - ;; - - ubuntu) - case "${LIVE_IMAGE_ARCHITECTURE}" in - amd64|i386) - LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-http://archive.ubuntu.com/ubuntu/}" - ;; - - *) - LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-http://ports.ubuntu.com/ubuntu-ports/}" - ;; - esac - - LB_PARENT_MIRROR_CHROOT_UPDATES="${LB_PARENT_MIRROR_CHROOT_UPDATES:-${LB_PARENT_MIRROR_CHROOT}}" - ;; - - *) - LB_PARENT_MIRROR_CHROOT_UPDATES="${LB_PARENT_MIRROR_CHROOT_UPDATES:-none}" - LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-none}" - ;; - esac - # Setting mirror which ends up in the image case "${LB_MODE}" in debian) @@ -520,37 +493,6 @@ Set_defaults () ;; esac - # Setting updates mirror which ends up in the image - case "${LB_MODE}" in - debian) - LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-${LB_MIRROR_BINARY}}" - LB_PARENT_MIRROR_BINARY_UPDATES="${LB_PARENT_MIRROR_BINARY_UPDATES:-${LB_PARENT_MIRROR_BINARY}}" - ;; - - progress-linux) - LB_PARENT_MIRROR_BINARY_UPDATES="${LB_PARENT_MIRROR_BINARY_UPDATES:-${LB_PARENT_MIRROR_BINARY}}" - LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-${LB_MIRROR_BINARY}}" - ;; - - ubuntu) - case "${LIVE_IMAGE_ARCHITECTURE}" in - amd64|i386) - LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-http://archive.ubuntu.com/ubuntu/}" - ;; - - *) - LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-http://ports.ubuntu.com/ubuntu-ports/}" - ;; - esac - - LB_PARENT_MIRROR_BINARY_UPDATES="${LB_PARENT_MIRROR_BINARY_UPDATES:-${LB_PARENT_MIRROR_BINARY}}" - ;; - - *) - LB_PARENT_MIRROR_BINARY_UPDATES="${LB_PARENT_MIRROR_BINARY_UPDATES:-none}" - ;; - esac - case "${LB_MODE}" in progress-linux) LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_CHROOT}}" diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 018330540..0277819f5 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -144,20 +144,20 @@ EOF if [ "${LB_UPDATES}" = "true" ] then - echo "deb ${LB_PARENT_MIRROR_CHROOT_UPDATES} ${LB_PARENT_DISTRIBUTION}-updates ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-updates ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_CHROOT_UPDATES} ${LB_PARENT_DISTRIBUTION}-updates ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-updates ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi - if [ "${LB_DERIVATIVE}" = "true" ] && [ "${LB_MIRROR_CHROOT_UPDATES}" != "none" ] + if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_CHROOT_UPDATES} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT_UPDATES} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi @@ -708,20 +708,20 @@ EOF if [ "${LB_UPDATES}" = "true" ] then - echo "deb ${LB_PARENT_MIRROR_BINARY_UPDATES} ${LB_PARENT_DISTRIBUTION}-updates ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION}-updates ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_BINARY_UPDATES} ${LB_PARENT_DISTRIBUTION}-updates ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION}-updates ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi - if [ "${LB_DERIVATIVE}" = "true" ] && [ "${LB_MIRROR_BINARY_UPDATES}" != "none" ] + if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_BINARY_UPDATES} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_BINARY_UPDATES} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_BINARY} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi diff --git a/scripts/build/config b/scripts/build/config index 117a4e6cf..0da7954ad 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -84,18 +84,14 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\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-updates URL]\n\ \t [--parent-mirror-binary URL]\n\ \t [--parent-mirror-binary-security URL]\n\ -\t [--parent-mirror-binary-updates URL]\n\ \t [--parent-mirror-debian-installer URL]\n\ \t [--mirror-bootstrap URL]\n\ \t [--mirror-chroot URL]\n\ \t [--mirror-chroot-security URL]\n\ -\t [--mirror-chroot-updates URL]\n\ \t [--mirror-binary URL]\n\ \t [--mirror-binary-security URL]\n\ -\t [--mirror-binary-updates URL]\n\ \t [--mirror-debian-installer URL]\n\ \t [--mode debian|emdebian|ubuntu]\n\ \t [--system live|normal]\n\ @@ -139,10 +135,10 @@ Local_arguments () cache-stages:,debconf-frontend:,debconf-priority:,dump, initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,tasksel:, templates:,architectures:,clean, - distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-chroot-updates:,parent-mirror-binary:, - parent-mirror-binary-security:,parent-mirror-binary-updates:,parent-mirror-debian-installer:, - mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-updates:,mirror-binary:, - mirror-binary-security:,mirror-binary-updates:,mirror-debian-installer:, + distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-binary:, + parent-mirror-binary-security:,parent-mirror-debian-installer:, + mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:, + mirror-binary-security:,mirror-debian-installer:, archives:,archive-areas:,parent-archive-areas:,chroot-filesystem:,exposed-root:, gzip-options:,hooks:,image-name:,interactive:,keyring-packages:,linux-flavours:,linux-packages:, security:,updates:,backports:,binary-filesystem:,binary-images:, @@ -383,11 +379,6 @@ Local_arguments () shift 2 ;; - --parent-mirror-chroot-updates) - LB_PARENT_MIRROR_CHROOT_UPDATES="${2}" - shift 2 - ;; - --parent-mirror-binary) LB_PARENT_MIRROR_BINARY="${2}" shift 2 @@ -398,11 +389,6 @@ Local_arguments () shift 2 ;; - --parent-mirror-binary-updates) - LB_PARENT_MIRROR_BINARY_UPDATES="${2}" - shift 2 - ;; - --parent-mirror-debian-installer) LB_PARENT_MIRROR_DEBIAN_INSTALLER="${2}" shift 2 @@ -423,11 +409,6 @@ Local_arguments () shift 2 ;; - --mirror-chroot-updates) - LB_MIRROR_CHROOT_UPDATES="${2}" - shift 2 - ;; - --mirror-binary) LB_MIRROR_BINARY="${2}" shift 2 @@ -438,11 +419,6 @@ Local_arguments () shift 2 ;; - --mirror-binary-updates) - LB_MIRROR_BINARY_UPDATES="${2}" - shift 2 - ;; - --mirror-debian-installer) LB_MIRROR_DEBIAN_INSTALLER="${2}" shift 2 @@ -1093,10 +1069,6 @@ LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT}" # (Default: ${LB_PARENT_MIRROR_CHROOT_SECURITY}) LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY}" -# \$LB_PARENT_MIRROR_CHROOT_UPDATES: set updates parent mirror to fetch packages from -# (Default: ${LB_PARENT_MIRROR_CHROOT_UPDATES}) -LB_PARENT_MIRROR_CHROOT_UPDATES="${LB_PARENT_MIRROR_CHROOT_UPDATES}" - # \$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}" @@ -1105,10 +1077,6 @@ LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY}" # (Default: ${LB_PARENT_MIRROR_BINARY_SECURITY}) LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY}" -# \$LB_PARENT_MIRROR_BINARY_UPDATES: set updates parent mirror which ends up in the image -# (Default: ${LB_PARENT_MIRROR_BINARY_UPDATES}) -LB_PARENT_MIRROR_BINARY_UPDATES="${LB_PARENT_MIRROR_BINARY_UPDATES}" - # \$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}" @@ -1125,10 +1093,6 @@ LB_MIRROR_CHROOT="${LB_MIRROR_CHROOT}" # (Default: ${LB_MIRROR_CHROOT_SECURITY}) LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY}" -# \$LB_MIRROR_CHROOT_UPDATES: set updates mirror to fetch packages from -# (Default: ${LB_MIRROR_CHROOT_UPDATES}) -LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES}" - # \$LB_MIRROR_BINARY: set mirror which ends up in the image # (Default: ${LB_MIRROR_BINARY}) LB_MIRROR_BINARY="${LB_MIRROR_BINARY}" @@ -1137,10 +1101,6 @@ LB_MIRROR_BINARY="${LB_MIRROR_BINARY}" # (Default: ${LB_MIRROR_BINARY_SECURITY}) LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}" -# \$LB_MIRROR_BINARY_UPDATES: set updates mirror which ends up in the image -# (Default: ${LB_MIRROR_BINARY_UPDATES}) -LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES}" - # \$LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror # (Default: ${LB_MIRROR_BOOTSTRAP}) LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}" |