diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2014-12-10 09:00:58 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2014-12-10 09:01:06 +0100 |
| commit | 07253b661cbbcdcd043a83018b3c68420b8813da (patch) | |
| tree | 5bdddccd647f910f7ad691bc336f169ca528e078 | |
| parent | 31dbf95d865503f7d3c67ed3ded6cb9926dfc3b4 (diff) | |
| download | vyos-live-build-07253b661cbbcdcd043a83018b3c68420b8813da.tar.gz vyos-live-build-07253b661cbbcdcd043a83018b3c68420b8813da.zip | |
Updating misc settings for progress-linux.
| -rwxr-xr-x | functions/defaults.sh | 4 | ||||
| -rwxr-xr-x | functions/releases.sh | 2 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_archive-keys | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 0e9bf3700..3949af190 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -149,7 +149,7 @@ Set_defaults () LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}" ;; - charon|charon-backports) + cairon|cairon-backports) LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-sid}" LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}" ;; @@ -276,7 +276,7 @@ Set_defaults () progress-linux) case "${LB_DISTRIBUTION}" in - chairon*) + cairon*) LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}" ;; diff --git a/functions/releases.sh b/functions/releases.sh index 3f1cc4b11..1f382a578 100755 --- a/functions/releases.sh +++ b/functions/releases.sh @@ -15,7 +15,7 @@ RELEASE_sid="unstable" # Progress Linux releases RELEASE_baureo="2" -RELEASE_charon="3" +RELEASE_cairon="3" # Ubuntu releases RELEASE_lucid="10.04" # LTS: 2015-04-01 diff --git a/scripts/build/bootstrap_archive-keys b/scripts/build/bootstrap_archive-keys index 4b9324f51..7b4c9738f 100755 --- a/scripts/build/bootstrap_archive-keys +++ b/scripts/build/bootstrap_archive-keys @@ -33,19 +33,19 @@ case "${LB_MODE}" in progress-linux) case "${LB_DISTRIBUTION}" in artax*) - _KEYS="1.0-artax 1.0-artax-packages" + _KEYS="artax artax-backports" ;; baureo*) - _KEYS="2.0-baureo 2.0-baureo-packages" + _KEYS="baureo baureo-backports" ;; - chairon*) - _KEYS="3.0-chairon 3.0-chairon-packages" + cairon*) + _KEYS="cairon cairon-backports" ;; esac - _URL="${LB_MIRROR_CHROOT}/project/keys" + _URL="${LB_MIRROR_CHROOT}/project/pgp" ;; esac |