diff options
| author | Lars Müller | 2006-12-17 11:11:43 +0100 |
|---|---|---|
| committer | Lars Müller | 2006-12-17 11:11:43 +0100 |
| commit | c9652d10de899ace6081d3187687a9db2001376d (patch) | |
| tree | 6cad6d16ee143ccee0c1d8d9b7f94cba03215f19 /installer/slxossetup | |
| parent | Config files from the prerequired packages - which must be present (diff) | |
| download | core-c9652d10de899ace6081d3187687a9db2001376d.tar.gz core-c9652d10de899ace6081d3187687a9db2001376d.tar.xz core-c9652d10de899ace6081d3187687a9db2001376d.zip | |
Add a default repo type in slxossetup and remove any repo type which is
identical to the default from the settings files.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@558 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/slxossetup')
| -rwxr-xr-x | installer/slxossetup | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/installer/slxossetup b/installer/slxossetup index c74033b5..82c6b9d8 100755 --- a/installer/slxossetup +++ b/installer/slxossetup @@ -62,7 +62,11 @@ function slxossetup_rpm() SMART_CHANNEL="${variable##*_}" SMART_BASEURL=$( eval echo \$$variable) SMART_NAME=$( eval echo \$SLX_INST_SOURCE_NAME_${SMART_CHANNEL}) + test "${SMART_NAME}" || \ + SMART_NAME="${SMART_CHANNEL}" SMART_TYPE=$( eval echo \$SLX_INST_SOURCE_TYPE_${SMART_CHANNEL}) + test "${SMART_TYPE}" || \ + SMART_TYPE="${REPO_TYPE}" PACKAGEKEYS=$( eval echo \$SLX_INST_SOURCE_PACKAGEKEYS_${SMART_CHANNEL}) smart --data-dir="${SLX_METADATA_PATH}" \ @@ -182,9 +186,11 @@ function slxossetup() *suse*) # Inform SUSE RPMs that we're performing an installation export YAST_IS_RUNNING="instsys" + REPO_TYPE="rpm-md" slxossetup_rpm ;; *fedora*) + REPO_TYPE="rpm-md" slxossetup_rpm ;; *) echo "$0: Error, unkown system ${SLX_SYSTEM_BASENAME}" ;; |