diff options
| author | Oliver Tappe | 2007-05-02 23:34:33 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-05-02 23:34:33 +0200 |
| commit | aaa042a0cb0ba83d60d6b9479a42665f7b1eab54 (patch) | |
| tree | db223d114e20802493ea5a1ec670abc008bca38f /lib | |
| parent | * reverted recent addition of --verbose-level to short help, as that is no sc... (diff) | |
| download | core-aaa042a0cb0ba83d60d6b9479a42665f7b1eab54.tar.gz core-aaa042a0cb0ba83d60d6b9479a42665f7b1eab54.tar.xz core-aaa042a0cb0ba83d60d6b9479a42665f7b1eab54.zip | |
overhaul the settings concept:
* now all settings live in the settings file, no more settings table in the DB
* clearified slxsettings and its options
* removed all references to db table 'settings'
* added some new extended settings
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@988 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/OpenSLX/Basics.pm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm index 6a23d8c0..f1c39e05 100644 --- a/lib/OpenSLX/Basics.pm +++ b/lib/OpenSLX/Basics.pm @@ -46,7 +46,7 @@ my %translations; # this hash will hold the active openslx configuration, # the initial content is based on environment variables or default values. -# Each value may be overrided from config files and/or cmdline arguments. +# Each value may be overridden from config files and/or cmdline arguments. %openslxConfig = ( 'croak' => '0', 'db-datadir' => $ENV{SLX_DB_DATADIR}, @@ -61,6 +61,14 @@ my %translations; 'public-path' => $ENV{SLX_PUBLIC_PATH} || '/srv/openslx', 'temp-path' => $ENV{SLX_TEMP_PATH} || '/tmp', 'verbose-level' => $ENV{SLX_VERBOSE_LEVEL} || '0', + # + # extended settings follow, which are only supported by slxsettings, + # but not by any other script: + # + 'system-default-nicmods' + => 'forcedeth e1000 e100 tg3 via-rhine r8169 pcnet32', + 'system-default-fsmods' => '', + 'ossetup-max-retry-count' => '5', ); chomp($openslxConfig{'locale-charmap'}); $openslxConfig{'bin-path'} @@ -75,6 +83,8 @@ $openslxConfig{'stage1-path'} = $ENV{SLX_STAGE1_PATH} || "$openslxConfig{'private-path'}/stage1", $openslxConfig{'tftpboot-path'} = $ENV{SLX_TFTPBOOT_PATH} || "$openslxConfig{'public-path'}/tftpboot", +$openslxConfig{'vmware-path'} + = $ENV{SLX_VMWARE_PATH} || "$openslxConfig{'base-path'}/vmware", # specification of cmdline arguments that are shared by all openslx-scripts: %cmdlineConfig; |