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

1 files changed, 35 insertions, 9 deletions

diff --git a/lib/distro-info/fedora-6_x86_64/settings.default b/lib/distro-info/fedora-6_x86_64/settings.default
index cbf2782a..bf97820a 100644
--- a/lib/distro-info/fedora-6_x86_64/settings.default
+++ b/lib/distro-info/fedora-6_x86_64/settings.default
@@ -2,6 +2,8 @@ bootstrap-packages = <<END
 	audit-libs-1.2.8-1.fc6.x86_64.rpm
 	basesystem-8.0-5.1.1.noarch.rpm
 	bash-3.1-16.1.x86_64.rpm
+	beecrypt-4.1.2-10.1.1.x86_64.rpm
+	bzip2-libs-1.0.3-3.x86_64.rpm
 	chkconfig-1.3.30-1.x86_64.rpm
 	coreutils-5.97-11.x86_64.rpm
 	cpio-2.6-19.x86_64.rpm
@@ -11,7 +13,10 @@ bootstrap-packages = <<END
 	device-mapper-1.02.07-3.x86_64.rpm
 	dmraid-1.0.0.rc13-1.fc6.x86_64.rpm
 	e2fsprogs-1.39-7.x86_64.rpm
+	e2fsprogs-libs-1.39-7.x86_64.rpm
+	elfutils-libelf-0.123-1.fc6.x86_64.rpm
 	ethtool-3-1.2.2.x86_64.rpm
+	expat-1.95.8-8.2.1.x86_64.rpm
 	fedora-release-6-4.noarch.rpm
 	fedora-release-notes-6-3.noarch.rpm
 	filesystem-2.4.0-1.x86_64.rpm
@@ -19,6 +24,7 @@ bootstrap-packages = <<END
 	gawk-3.1.5-11.x86_64.rpm
 	gdbm-1.8.0-26.2.1.x86_64.rpm
 	glib2-2.12.3-2.fc6.x86_64.rpm
+	glibc-2.5-3.x86_64.rpm
 	glibc-common-2.5-3.x86_64.rpm
 	grep-2.5.1-54.1.x86_64.rpm
 	gzip-1.3.5-9.x86_64.rpm
@@ -28,10 +34,15 @@ bootstrap-packages = <<END
 	iputils-20020927-41.fc6.x86_64.rpm
 	kernel-2.6.18-1.2798.fc6.x86_64.rpm
 	kpartx-0.4.7-5.x86_64.rpm
+	krb5-libs-1.5-7.x86_64.rpm
 	less-394-4.1.x86_64.rpm
 	libacl-2.2.39-1.1.x86_64.rpm
 	libattr-2.4.32-1.1.x86_64.rpm
 	libcap-1.10-25.x86_64.rpm
+	libgcc-4.1.1-30.x86_64.rpm
+	libselinux-1.30.29-2.x86_64.rpm
+	libsepol-1.12.27-1.x86_64.rpm
+	libstdc++-4.1.1-30.x86_64.rpm
 	libtermcap-2.0.8-46.1.x86_64.rpm
 	lvm2-2.02.06-4.x86_64.rpm
 	MAKEDEV-3.23-1.2.x86_64.rpm
@@ -42,16 +53,22 @@ bootstrap-packages = <<END
 	module-init-tools-3.3-0.pre1.4.17.x86_64.rpm
 	nash-5.1.19-1.x86_64.rpm
 	ncurses-5.5-24.20060715.x86_64.rpm
+	neon-0.25.5-5.1.x86_64.rpm
 	net-tools-1.60-73.x86_64.rpm
+	openssl-0.9.8b-8.x86_64.rpm
 	pam-0.99.6.2-3.fc6.x86_64.rpm
 	pcre-6.6-1.1.x86_64.rpm
+	popt-1.10.2-32.x86_64.rpm
 	procps-3.2.7-8.x86_64.rpm
 	psmisc-22.2-5.x86_64.rpm
 	python-2.4.3-18.fc6.x86_64.rpm
 	readline-5.1-1.1.x86_64.rpm
+	rpm-4.4.2-32.x86_64.rpm
+	rpm-libs-4.4.2-32.x86_64.rpm
 	sed-4.1.5-5.fc6.x86_64.rpm
 	setup-2.5.55-1.noarch.rpm
 	shadow-utils-4.0.17-5.x86_64.rpm
+	sqlite-3.3.6-2.x86_64.rpm
 	sysklogd-1.4.1-39.2.x86_64.rpm
 	SysVinit-2.86-14.x86_64.rpm
 	tar-1.15.1-19.x86_64.rpm
@@ -59,14 +76,19 @@ bootstrap-packages = <<END
 	tzdata-2006m-2.fc6.noarch.rpm
 	udev-095-14.x86_64.rpm
 	util-linux-2.13-0.44.fc6.x86_64.rpm
-	libxml2-2.6.26-2.1.1.x86_64.rpm
-	python-elementtree-1.2.6-5.x86_64.rpm
-	python-sqlite-1.1.7-1.2.1.x86_64.rpm
-	python-urlgrabber-2.9.9-2.noarch.rpm
-	rpm-python-4.4.2-32.x86_64.rpm
-	yum-3.0-6.noarch.rpm
-	yum-metadata-parser-1.0-8.fc6.x86_64.rpm
+	zlib-1.2.3-3.x86_64.rpm
 END
+<metapackager yum>
+	packages = <<END
+		libxml2-2.6.26-2.1.1.x86_64.rpm
+		python-elementtree-1.2.6-5.x86_64.rpm
+		python-sqlite-1.1.7-1.2.1.x86_64.rpm
+		python-urlgrabber-2.9.9-2.noarch.rpm
+		rpm-python-4.4.2-32.x86_64.rpm
+		yum-3.0-6.noarch.rpm
+		yum-metadata-parser-1.0-8.fc6.x86_64.rpm
+	END
+</metapackager>
 package-subdir = Fedora/RPMS
 prereq-packages = <<END
 	beecrypt-4.1.2-10.1.1.x86_64.rpm
@@ -81,8 +103,8 @@ prereq-packages = <<END
 	libsepol-1.12.27-1.x86_64.rpm
 	libstdc++-4.1.1-30.x86_64.rpm
 	neon-0.25.5-5.1.x86_64.rpm
-	popt-1.10.2-32.x86_64.rpm
 	openssl-0.9.8b-8.x86_64.rpm
+	popt-1.10.2-32.x86_64.rpm
 	rpm-4.4.2-32.x86_64.rpm
 	rpm-libs-4.4.2-32.x86_64.rpm
 	sqlite-3.3.6-2.x86_64.rpm
@@ -94,6 +116,10 @@ END
 <repository base_update>
 	name = Fedora Core 6 updates
 </repository>
+<selection minimal>
+	packages = <<END
+	END
+</selection>
 <selection default>
-	packages =
+	base = minimal
 </selection>