diff options
| author | Oliver Tappe | 2007-04-13 13:42:55 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2007-04-13 13:42:55 +0200 |
| commit | 724fb56e03eae6e4b8ab53a7b5395d6f8a82c7ea (patch) | |
| tree | f01e2b9e9061ced72e3b1a6a2542047672220813 | |
| parent | * changed folder structure underneath /srv/openslx/tftpboot/pxe from system-b... (diff) | |
| download | core-724fb56e03eae6e4b8ab53a7b5395d6f8a82c7ea.tar.gz core-724fb56e03eae6e4b8ab53a7b5395d6f8a82c7ea.tar.xz core-724fb56e03eae6e4b8ab53a7b5395d6f8a82c7ea.zip | |
* added support for building selections on top of other selections. You can include
existing selection with one or more <<<name>>> constructions.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@883 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm | 4 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm | 4 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm index ff8090fc..e6f7203b 100644 --- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm +++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm @@ -166,9 +166,11 @@ sub initDistroInfo "; $self->{config}->{'selection'} = { - 'default' => "", + 'default' => " + ", 'gnome' => " + <<<default>>> 3ddiag 855resolution a2ps diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm index eedf82e8..97dd80f2 100644 --- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm +++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm @@ -184,9 +184,11 @@ sub initDistroInfo "; $self->{config}->{'selection'} = { - 'default' => "", + 'default' => " + ", 'kde' => " + <<<default>>> 3ddiag 915resolution a2ps diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index 61fd0087..98077a27 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -348,6 +348,10 @@ sub readDistroInfo die _tr("error in config-file '%s' (%s)", $file, $@)."\n"; } } + # ...expand selection definitions... + foreach my $selKey (keys %selection) { + $selection{$selKey} =~ s[<<<([^>]+)>>>][$selection{$1}]eg; + } # ...and store merged config: $self->{'distro-info'} = { 'package-subdir' => $package_subdir, |