diff options
author | Oliver Tappe | 2007-12-30 18:52:18 +0100 |
---|---|---|
committer | Oliver Tappe | 2007-12-30 18:52:18 +0100 |
commit | b681bcf8ed09029520958106365fd61be8faf24f (patch) | |
tree | ee9d8e8b1cb810a2366fca180aef08dd15203a6d /lib/distro-info/debian-4.0_amd64 | |
parent | * completed test set for attribute merging, fixing several bugs along the (diff) | |
download | core-b681bcf8ed09029520958106365fd61be8faf24f.tar.gz core-b681bcf8ed09029520958106365fd61be8faf24f.tar.xz core-b681bcf8ed09029520958106365fd61be8faf24f.zip |
cleaned up installation code in several ways:
* Removed some inconsistencies with respect to the separation of prereq-
and bootstrap-packages, such that now all packages are being installed
properly into the final system (the prereq packages have to installed
twice for this).
Before, the prereq packages were being installed without their scripts
ever being run. While I haven't noticed a specific bug caused by this,
the mere possibility seemed a good enough cause to change this.
* added a default /etc/hosts file to all distros, as otherwise the lookup
of localhost is flaky (at best)
* fixed a multiple inclusion bug when expanding the packages of a selection
* improved and clarified structure of selections:
+ now there is always a 'minimal' selection, on which most others are based
+ the default selection is now merely a different name for some other
selection (currently, minimal or textmode, later this should probably be
gnome or kde).
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1438 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'lib/distro-info/debian-4.0_amd64')
-rw-r--r-- | lib/distro-info/debian-4.0_amd64/settings.default | 11 | ||||
-rw-r--r-- | lib/distro-info/debian-4.0_amd64/settings.example | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/distro-info/debian-4.0_amd64/settings.default b/lib/distro-info/debian-4.0_amd64/settings.default index 2107c55d..be46fe14 100644 --- a/lib/distro-info/debian-4.0_amd64/settings.default +++ b/lib/distro-info/debian-4.0_amd64/settings.default @@ -9,26 +9,29 @@ release-name = etch repo-subdir = dists file-for-speedtest = dists/etch/main/binary-amd64/Packages.bz2 </repository> -<selection default> +<selection minimal> packages = <<END linux-image-amd64 locales-all END </selection> <selection gnome> - base = default + base = minimal packages = <<END gnome END </selection> <selection kde> - base = default + base = minimal packages = <<END kde END </selection> +<selection default> + base = minimal +</selection> <selection openslx-build> - base = default + base = minimal packages = <<END bzip2 gcc diff --git a/lib/distro-info/debian-4.0_amd64/settings.example b/lib/distro-info/debian-4.0_amd64/settings.example index e4436bed..d09a8710 100644 --- a/lib/distro-info/debian-4.0_amd64/settings.example +++ b/lib/distro-info/debian-4.0_amd64/settings.example @@ -14,3 +14,4 @@ # packages = <<END # kinternet # END +#</selection> |