diff options
| -rwxr-xr-x | functions/defaults.sh | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_rootfs | 3 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_hacks | 10 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 12 |
4 files changed, 2 insertions, 25 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index a935674a4..fcc6ae7c0 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -830,8 +830,6 @@ Set_defaults () LB_BINARY_INDICES="${LB_BINARY_INDICES:-true}" fi - LB_BINARY_POOL="${LB_BINARY_POOL:-false}" - # Setting bootloader if [ -z "${LB_BOOTLOADER}" ] then diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs index 173c5cc3f..b5ca06899 100755 --- a/scripts/build/lb_binary_rootfs +++ b/scripts/build/lb_binary_rootfs @@ -420,9 +420,8 @@ case "${LB_CHROOT_FILESYSTEM}" in ;; esac ;; -esac -rm -f chroot/etc/apt/sources.list.d/live-media.list +esac for STAGE in ${LB_CACHE_STAGES} do diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks index 365abbfa2..61b0a7036 100755 --- a/scripts/build/lb_chroot_hacks +++ b/scripts/build/lb_chroot_hacks @@ -216,16 +216,6 @@ then rm -f chroot/etc/fstab fi -if [ "${LB_BINARY_POOL}" = "true" ] -then - echo "deb file:/live/image/debian ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list.d/live-media.list - - if [ "${LB_SOURCE}" = "true" ] - then - echo "deb-src file:/live/image/debian ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/live-media.list - fi -fi - if [ "${LB_EXPOSED_ROOT}" = "true" ] then # Make sure RW dirs exist so that the initramfs script has diff --git a/scripts/build/lb_config b/scripts/build/lb_config index 455d31371..3d0583ea5 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -41,7 +41,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [-b|--binary-images iso|net|tar|usb-hdd]\n\ \t [--binary-filesystem fat16|fat32]\n\ \t [--binary-indices true|false|none]\n\ -\t [--binary-pool true|false]\n\ \t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\ \t [--bootloader grub|syslinux|yaboot]\n\ @@ -148,7 +147,7 @@ Local_arguments () mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:, gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:, packages:,packages-lists:,tasks:,security:,volatile:,backports:,sysvinit:,binary-filesystem:,binary-images:, - binary-indices:,binary-pool:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:, + binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:, debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:, encryption:,grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:, iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:, @@ -543,11 +542,6 @@ Local_arguments () shift 2 ;; - --binary-pool) - LB_BINARY_POOL="${2}" - shift 2 - ;; - --bootappend-live) LB_BOOTAPPEND_LIVE="${2}" shift 2 @@ -1154,10 +1148,6 @@ LB_BINARY_IMAGES="${LB_BINARY_IMAGES}" # (Default: ${LB_BINARY_INDICES}) LB_BINARY_INDICES="${LB_BINARY_INDICES}" -# \$LB_BINARY_POOL: enable live-media repository in live system -# (Default: ${LB_BINARY_POOL}) -LB_BINARY_POOL="${LB_BINARY_POOL}" - # \$LB_BOOTAPPEND_LIVE: set boot parameters # (Default: empty) LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE}" |