diff options
Diffstat (limited to 'src/config-db')
| -rwxr-xr-x | src/config-db/slxconfig-demuxer | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/config-db/slxconfig-demuxer b/src/config-db/slxconfig-demuxer index dadd814b..ef2978fc 100755 --- a/src/config-db/slxconfig-demuxer +++ b/src/config-db/slxconfig-demuxer @@ -101,7 +101,7 @@ openslxInit(); my $openslxDB = OpenSLX::ConfigDB->new(); $openslxDB->connect(); -my $clientConfigPath = "$openslxConfig{'private-path'}/config"; +my $clientConfigPath = "$openslxConfig{'private-path'}/config/stage3"; # make sure that the default config folders exist: if (createConfigFolderForDefaultSystem()) { # this path should have been generated by earlier stage (slxsettings), so @@ -266,8 +266,8 @@ sub writeSlxConfigToFile } sub copyExternalSystemConfig -{ # copies local configuration extensions of given system from private - # config folder (var/lib/openslx/config/...) into a temporary folder +{ # copies local configuration extensions of given system from private config + # folder (var/lib/openslx/config/stage3/...) into a temporary folder my $systemName = shift; my $targetPath = shift; my $clientName = shift; # optional @@ -827,13 +827,14 @@ specifying all the attributes of that particular system and/or client Furthermore, each system-specific archive may contain additional system files that are required for that system (e.g. a special PAM-module required for LDAP -authentication). These files are copied from F<$SLX_PRIVATE_PATH/config/default> -and F<$SLX_PROVATE_PATH/config/<system-name>>. +authentication). These files are copied from +F<$SLX_PRIVATE_PATH/config/stage3/default> and +F<$SLX_PROVATE_PATH/config/stage3/<system-name>>. On top of that, each client may have its own set of system files, too (e.g. some config files required to install a special kind of hardware available only on that client). These files are copied from -F<< $SLX_PROVATE_PATH/config/<system-name>/01-<MAC-of-client> >>. +F<< $SLX_PROVATE_PATH/config/stage3/<system-name>/01-<MAC-of-client> >>. =back |