diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2013-03-21 16:58:30 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:07 +0200 |
| commit | 68700f466c142082e7423282ca4caaf7552bf8e9 (patch) | |
| tree | af7738d192770461abb1a742998be8880c29f830 /functions | |
| parent | dd15ade8bbdc6360816ed858253e7aaa68e4c9c2 (diff) | |
| download | vyos-live-build-68700f466c142082e7423282ca4caaf7552bf8e9.tar.gz vyos-live-build-68700f466c142082e7423282ca4caaf7552bf8e9.zip | |
Dropping dedicated updates (formerly volatile) mirror handling, not needed anymore.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 58 |
1 files changed, 0 insertions, 58 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}}" |