summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2014-12-10 09:00:58 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2014-12-10 09:01:06 +0100
commit07253b661cbbcdcd043a83018b3c68420b8813da (patch)
tree5bdddccd647f910f7ad691bc336f169ca528e078 /functions
parent31dbf95d865503f7d3c67ed3ded6cb9926dfc3b4 (diff)
downloadvyos-live-build-07253b661cbbcdcd043a83018b3c68420b8813da.tar.gz
vyos-live-build-07253b661cbbcdcd043a83018b3c68420b8813da.zip
Updating misc settings for progress-linux.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh4
-rwxr-xr-xfunctions/releases.sh2
2 files changed, 3 insertions, 3 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