diff options
| author | Lars Müller | 2006-12-16 10:18:06 +0100 |
|---|---|---|
| committer | Lars Müller | 2006-12-16 10:18:06 +0100 |
| commit | 6abe87925b451c88b17c0f5a168eb9fc57cc626e (patch) | |
| tree | 104ff85c72cbe7cbe566bfdcff28dcca720054e8 /installer | |
| parent | Enabled busybox udev service (see #99 too). Integrated for genereal use (diff) | |
| download | core-6abe87925b451c88b17c0f5a168eb9fc57cc626e.tar.gz core-6abe87925b451c88b17c0f5a168eb9fc57cc626e.tar.xz core-6abe87925b451c88b17c0f5a168eb9fc57cc626e.zip | |
Move YAST_IS_RUNNING define to the place where we're able to devide
between different OS vendors.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@552 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/slxossetup | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/installer/slxossetup b/installer/slxossetup index 10f581a5..972609ba 100755 --- a/installer/slxossetup +++ b/installer/slxossetup @@ -38,7 +38,7 @@ for suffix in "" local ${SLX_SYSTEM_VARIANTNAME}; do . "${SLX_SYSTEM_CONFIG_PATH}/settings${suffix:+.$suffix}" done -function slxossetup_rpm_suse() +function slxossetup_rpm() { SLX_METADATA_PATH="${SLX_PRIVATE_PATH}/metadata/${SLX_SYSTEM_NAME}" SLX_STAGE1_PATH="${SLX_PRIVATE_PATH}/stage1/${SLX_SYSTEM_NAME}" @@ -143,9 +143,6 @@ function slxossetup_rpm_suse() packagelist="${packagelist} $( eval echo \$$variable)" done - # Inform SUSE RPMs that we're doing installation - export YAST_IS_RUNNING="instsys" - smart --data-dir="${SLX_METADATA_PATH}" \ install \ ${packagelist} \ @@ -155,7 +152,11 @@ function slxossetup_rpm_suse() function slxossetup() { case "${SLX_SYSTEM_BASENAME}" in - *suse*) slxossetup_rpm_suse ;; + *suse*) + # Inform SUSE RPMs that we're performing an installation + export YAST_IS_RUNNING="instsys" + slxossetup_rpm + ;; *) echo "$0: Error, unkown system ${SLX_SYSTEM_BASENAME}" ;; esac } |