diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-09-20 16:53:03 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-09-26 14:43:12 +0200 |
| commit | 9228a0ca66324c01ca4b32b40749923f2bf5e3a8 (patch) | |
| tree | 5ea4eac02fd78a3ef3435bd203f1df766ac83d39 /functions | |
| parent | 017ce07eb4c5c4954091942a41c9b9fb72572704 (diff) | |
| download | vyos-live-build-9228a0ca66324c01ca4b32b40749923f2bf5e3a8.tar.gz vyos-live-build-9228a0ca66324c01ca4b32b40749923f2bf5e3a8.zip | |
Renaming volatile options refering to volatile archive to updates to match current archive namings.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 98ace32a8..bd7f0a4f7 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -434,30 +434,30 @@ Set_defaults () ;; esac - # Setting volatile mirror to fetch packages from + # Setting updates mirror to fetch packages from case "${LB_MODE}" in debian|progress) - LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-${LB_PARENT_MIRROR_CHROOT}}" - LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-${LB_MIRROR_CHROOT}}" + 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|kubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) - LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-http://archive.ubuntu.com/ubuntu/}" + LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-http://archive.ubuntu.com/ubuntu/}" ;; *) - LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-http://ports.ubuntu.com/ubuntu-ports/}" + LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-http://ports.ubuntu.com/ubuntu-ports/}" ;; esac - LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-${LB_PARENT_MIRROR_CHROOT}}" + LB_PARENT_MIRROR_CHROOT_UPDATES="${LB_PARENT_MIRROR_CHROOT_UPDATES:-${LB_PARENT_MIRROR_CHROOT}}" ;; *) - LB_PARENT_MIRROR_CHROOT_VOLATILE="${LB_PARENT_MIRROR_CHROOT_VOLATILE:-none}" - LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT_VOLATILE:-none}" + LB_PARENT_MIRROR_CHROOT_UPDATES="${LB_PARENT_MIRROR_CHROOT_UPDATES:-none}" + LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-none}" ;; esac @@ -542,34 +542,34 @@ Set_defaults () ;; esac - # Setting volatile mirror which ends up in the image + # Setting updates mirror which ends up in the image case "${LB_MODE}" in debian) - 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}}" + 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) - LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-${LB_PARENT_MIRROR_BINARY}}" - LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE:-${LB_MIRROR_BINARY}}" + 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|kubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) - LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE:-http://archive.ubuntu.com/ubuntu/}" + LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-http://archive.ubuntu.com/ubuntu/}" ;; *) - LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY_VOLATILE:-http://ports.ubuntu.com/ubuntu-ports/}" + LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-http://ports.ubuntu.com/ubuntu-ports/}" ;; esac - LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-${LB_PARENT_MIRROR_BINARY}}" + LB_PARENT_MIRROR_BINARY_UPDATES="${LB_PARENT_MIRROR_BINARY_UPDATES:-${LB_PARENT_MIRROR_BINARY}}" ;; *) - LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-none}" + LB_PARENT_MIRROR_BINARY_UPDATES="${LB_PARENT_MIRROR_BINARY_UPDATES:-none}" ;; esac @@ -850,14 +850,14 @@ Set_defaults () ;; esac - # Setting volatile updates option + # Setting updates updates option case "${LB_PARENT_DISTRIBUTION}" in wheezy|jessie|sid) - LB_VOLATILE="${LB_VOLATILE:-false}" + LB_UPDATES="${LB_UPDATES:-false}" ;; *) - LB_VOLATILE="${LB_VOLATILE:-true}" + LB_UPDATES="${LB_UPDATES:-true}" ;; esac |