diff options
| -rwxr-xr-x | installer/slxossetup | 11 | ||||
| -rw-r--r-- | installer/systems/ubuntu610/settings | 2 | ||||
| -rw-r--r-- | installer/systems/ubuntu610/settings.local.example | 7 |
3 files changed, 16 insertions, 4 deletions
diff --git a/installer/slxossetup b/installer/slxossetup index cff7ee13..6e567ec7 100755 --- a/installer/slxossetup +++ b/installer/slxossetup @@ -128,7 +128,7 @@ function install_prereq_packages() if test "${BOOTSTRAP_PATH}" -a -x "${BOOTSTRAP_PATH}/usr/sbin/debootstrap"; then DEBOOTSTRAP_DIR="${BOOTSTRAP_PATH}/usr/lib/debootstrap" \ "${BOOTSTRAP_PATH}/usr/sbin/debootstrap" \ - "${SLX_INST_SOURCE_DISTRIBUTION_main}" \ + "${SLX_INST_SOURCE_DISTRIBUTION}" \ "${SLX_STAGE1_PATH}" \ "${SLX_INST_SOURCE_BASEURL}" rm -rf "${BOOTSTRAP_PATH}" @@ -180,6 +180,7 @@ function slxossetup_smart() unset SMART_COMPONENTS \ SMART_DISTRIBUTION \ SMART_NAME \ + SMART_PRIORITY \ SMART_TYPE \ PACKAGEKEYS @@ -197,9 +198,10 @@ function slxossetup_smart() # Has this config distribution, components SMART_DISTRIBUTION=$( eval echo \$SLX_INST_SOURCE_DISTRIBUTION_${SMART_CHANNEL}) SMART_COMPONENTS=$( eval echo \$SLX_INST_SOURCE_COMPONENTS_${SMART_CHANNEL}) + SMART_PRIORITY=$( eval echo \$SLX_INST_SOURCE_PRIORITY_${SMART_CHANNEL}) # Check if one of our global settings is still undefined for setting in ${GLOBAL_SETTINGS}; do - test $( eval echo \$SMART_${setting}) || \ + test "$( eval echo \$SMART_${setting})" || \ eval SMART_${setting}=\$SLX_INST_SOURCE_${setting} done @@ -208,6 +210,8 @@ function slxossetup_smart() SMART_DISTRIBUTION="distribution=\"${SMART_DISTRIBUTION}\"" test "${SMART_COMPONENTS}" && \ SMART_COMPONENTS="components=\"${SMART_COMPONENTS}\"" + test "${SMART_PRIORITY}" && \ + SMART_PRIORITY="priority=\"${SMART_PRIORITY}\"" PACKAGEKEYS=$( eval echo \$SLX_INST_SOURCE_PACKAGEKEYS_${SMART_CHANNEL}) @@ -219,6 +223,7 @@ function slxossetup_smart() baseurl=\"${SMART_BASEURL}\" \ ${SMART_DISTRIBUTION} \ ${SMART_COMPONENTS} \ + ${SMART_PRIORITY} \ -y for packagekey in ${PACKAGEKEYS}; do @@ -292,7 +297,7 @@ function slxossetup() slxossetup_smart ;; *ubuntu*) - GLOBAL_SETTINGS="BASEURL COMPONENTS" + GLOBAL_SETTINGS="BASEURL COMPONENTS DISTRIBUTION" REPO_TYPE="apt-deb" NAME_DEST_ROOT="deb-root" SLX_STAGE1_CREATE_DIR="/var/lib/dpkg/updates" diff --git a/installer/systems/ubuntu610/settings b/installer/systems/ubuntu610/settings index 81e9286d..778a4e32 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_DISTRIBUTION_main="edgy" 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 new file mode 100644 index 00000000..3970b65c --- /dev/null +++ b/installer/systems/ubuntu610/settings.local.example @@ -0,0 +1,7 @@ +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_ubuntu610updates="http://ftp-1.gwdg.de/pub/linux/debian/ubuntu" +SLX_INST_SOURCE_BASEURL_ubuntu610security="http://ftp-1.gwdg.de/pub/linux/debian/ubuntu" |