summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorLars Müller2006-12-19 18:11:23 +0100
committerLars Müller2006-12-19 18:11:23 +0100
commitfef1eac92d5723c786085bf3b80f8d2ff39b61c4 (patch)
treefd0b9828e0753cb9e362393b756e84c30de4e8cf /installer
parentAllow to set the priority of an installation source. (diff)
downloadcore-fef1eac92d5723c786085bf3b80f8d2ff39b61c4.tar.gz
core-fef1eac92d5723c786085bf3b80f8d2ff39b61c4.tar.xz
core-fef1eac92d5723c786085bf3b80f8d2ff39b61c4.zip
We no longer have to use the _main suffix for SLX_INST_SOURCE* as we
have the global SLX_INST_SOURCE_DISTRIBUTION to identify the used Debian distribution for bootstrapping. git-svn-id: http://svn.openslx.org/svn/openslx/trunk@576 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rw-r--r--installer/systems/ubuntu610/settings2
-rw-r--r--installer/systems/ubuntu610/settings.local.example2
2 files changed, 2 insertions, 2 deletions
diff --git a/installer/systems/ubuntu610/settings b/installer/systems/ubuntu610/settings
index 778a4e32..4c246b59 100644
--- a/installer/systems/ubuntu610/settings
+++ b/installer/systems/ubuntu610/settings
@@ -1,7 +1,7 @@
SLX_INST_SOURCE_BASEURL="http://ftp-1.gwdg.de/pub/linux/debian/ubuntu"
SLX_INST_SOURCE_COMPONENTS="main restricted multiverse universe"
SLX_INST_SOURCE_DISTRIBUTION="edgy"
-SLX_INST_SOURCE_NAME_main="Ubuntu 6.10"
+SLX_INST_SOURCE_NAME_ubuntu610="Ubuntu 6.10"
SLX_INST_SOURCE_NAME_ubuntu610updates="Ubuntu 6.10 updates"
SLX_INST_SOURCE_DISTRIBUTION_ubuntu610updates="edgy-updates"
SLX_INST_SOURCE_NAME_ubuntu610security="Ubuntu 6.10 security"
diff --git a/installer/systems/ubuntu610/settings.local.example b/installer/systems/ubuntu610/settings.local.example
index 3970b65c..6159cb1d 100644
--- a/installer/systems/ubuntu610/settings.local.example
+++ b/installer/systems/ubuntu610/settings.local.example
@@ -2,6 +2,6 @@ SLX_INST_SOURCE_BASEURL="ftp://gab/pub/ubuntu"
SLX_INST_SOURCE_COMPONENTS_ubuntu610dvd="main restricted"
SLX_INST_SOURCE_NAME_ubuntu610dvd="Ubuntu 6.10 DVD"
SLX_INST_SOURCE_PRIORITY_ubuntu610dvd="10"
-SLX_INST_SOURCE_BASEURL_main="http://ftp-1.gwdg.de/pub/linux/debian/ubuntu"
+SLX_INST_SOURCE_BASEURL_ubuntu610="http://ftp-1.gwdg.de/pub/linux/debian/ubuntu"
SLX_INST_SOURCE_BASEURL_ubuntu610updates="http://ftp-1.gwdg.de/pub/linux/debian/ubuntu"
SLX_INST_SOURCE_BASEURL_ubuntu610security="http://ftp-1.gwdg.de/pub/linux/debian/ubuntu"