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

3 files changed, 769 insertions, 1 deletions

diff --git a/lib/distro-info/suse-10.2_x86_64/prereqfiles/etc/hosts b/lib/distro-info/suse-10.2_x86_64/prereqfiles/etc/hosts
new file mode 100644
index 00000000..75721cd5
--- /dev/null
+++ b/lib/distro-info/suse-10.2_x86_64/prereqfiles/etc/hosts
@@ -0,0 +1 @@
+127.0.0.1 localhost
diff --git a/lib/distro-info/suse-10.2_x86_64/settings.default b/lib/distro-info/suse-10.2_x86_64/settings.default
index f2ac2457..c903ea1b 100644
--- a/lib/distro-info/suse-10.2_x86_64/settings.default
+++ b/lib/distro-info/suse-10.2_x86_64/settings.default
@@ -4,6 +4,7 @@ bootstrap-packages = <<END
 	x86_64/audit-libs-1.2.6-20.x86_64.rpm
 	x86_64/bash-3.1-55.x86_64.rpm
 	x86_64/blocxx-1.0.0-36.x86_64.rpm
+	x86_64/bzip2-1.0.3-36.x86_64.rpm
 	x86_64/coreutils-6.4-10.x86_64.rpm
 	x86_64/cpio-2.6-40.x86_64.rpm
 	x86_64/cracklib-2.8.9-20.x86_64.rpm
@@ -17,6 +18,7 @@ bootstrap-packages = <<END
 	x86_64/findutils-4.2.28-24.x86_64.rpm
 	x86_64/gawk-3.1.5-41.x86_64.rpm
 	x86_64/gdbm-1.8.3-261.x86_64.rpm
+	x86_64/glibc-2.5-25.x86_64.rpm
 	x86_64/glibc-32bit-2.5-25.x86_64.rpm
 	x86_64/gpg-1.4.5-24.x86_64.rpm
 	x86_64/grep-2.5.1a-40.x86_64.rpm
@@ -54,12 +56,15 @@ bootstrap-packages = <<END
 	x86_64/perl-Bootloader-0.4.5-3.x86_64.rpm
 	x86_64/perl-gettext-1.05-31.x86_64.rpm
 	x86_64/permissions-2006.11.13-5.x86_64.rpm
+	x86_64/popt-1.7-304.x86_64.rpm
 	x86_64/readline-5.1-55.x86_64.rpm
 	x86_64/reiserfs-3.6.19-37.x86_64.rpm
+	x86_64/rpm-4.4.2-76.x86_64.rpm
 	x86_64/sed-4.1.5-21.x86_64.rpm
 	x86_64/sysvinit-2.86-47.x86_64.rpm
 	x86_64/udev-103-12.x86_64.rpm
 	x86_64/util-linux-2.12r-61.x86_64.rpm
+	x86_64/zlib-1.2.3-33.x86_64.rpm
 	noarch/pciutils-ids-2006.11.18-2.noarch.rpm
 	noarch/suse-build-key-1.0-707.noarch.rpm
 END
@@ -109,7 +114,13 @@ END
 	name = openSUSE 10.2 updates
 	file-for-speedtest = repodata/primary.xml.gz
 </repository>
-<selection default>
+<selection minimal>
+	packages = <<END
+		glibc-locale
+	END
+</selection>
+<selection textmode>
+	base = minimal
 	packages = <<END
 		acl
 		acpid
@@ -300,3 +311,758 @@ END
 		zsh
 	END
 </selection>
+<selection kde>
+	base = textmode
+	packages = <<END
+		3ddiag
+		915resolution
+		a2ps
+		aaa_base
+		aaa_skel
+		aalib
+		acl
+		acpid
+		AdobeICCProfiles
+		agfa-fonts
+		alsa
+		amarok
+		amarok-libvisual
+		amarok-xine
+		apparmor-docs
+		apparmor-parser
+		apparmor-profiles
+		apparmor-utils
+		arts
+		ash
+		aspell
+		aspell-de
+		aspell-en
+		at
+		atk
+		attr
+		audiofile
+		audit
+		audit-libs
+		autofs
+		autoyast2
+		autoyast2-installation
+		bash
+		bc
+		bind-libs
+		bind-utils
+		binutils
+		blocxx
+		bluez-libs
+		bluez-utils
+		boost
+		bootsplash
+		bootsplash-theme-SuSE
+		bzip2
+		cabextract
+		cairo
+		cdparanoia
+		cdrdao
+		CheckHardware
+		checkmedia
+		chromium
+		classpath
+		compat
+		compat-libstdc++
+		compat-openssl097g
+		compiz
+		coreutils
+		cpio
+		cpp
+		cpp41
+		cpufrequtils
+		cracklib
+		cron
+		Crystalcursors
+		cups
+		cups-client
+		cups-drivers
+		cups-libs
+		curl
+		cyrus-sasl
+		cyrus-sasl-crammd5
+		cyrus-sasl-digestmd5
+		cyrus-sasl-plain
+		cyrus-sasl-saslauthd
+		db
+		dbus-1
+		dbus-1-glib
+		dbus-1-mono
+		dbus-1-qt3
+		dbus-1-x11
+		db-utils
+		dcraw
+		dejavu
+		deltarpm
+		desktop-data-SuSE
+		desktop-file-utils
+		desktop-translations
+		device-mapper
+		dhcdbd
+		dhcp
+		dhcpcd
+		dhcp-client
+		dialog
+		diffutils
+		digikam
+		digikamimageplugins
+		dirmngr
+		dmraid
+		dos2unix
+		dosbootdisk
+		dosfstools
+		dvd+rw-tools
+		e2fsprogs
+		ed
+		efont-unicode
+		eject
+		enscript
+		esound
+		ethtool
+		evms
+		evms-gui
+		exiftool
+		expat
+		fam
+		fbset
+		fftw3
+		file
+		fileshareset
+		filesystem
+		fillup
+		findutils
+		flac
+		flash-player
+		fontconfig
+		fonts-config
+		foomatic-filters
+		freealut
+		freeciv
+		freeglut
+		freetype
+		freetype2
+		fribidi
+		frozen-bubble
+		ft2demos
+		ftgl
+		fvwm2
+		gail
+		gawk
+		gcc41-gij
+		gcc-gij
+		gconf2
+		gdb
+		gdbm
+		gettext
+		ghostscript-fonts-other
+		ghostscript-fonts-std
+		ghostscript-library
+		ghostscript-x11
+		giflib
+		gimp
+		gimp-help
+		gle
+		glib
+		glib2
+		glibc
+		glibc-i18ndata
+		glib-sharp2
+		glitz
+		gmime
+		gmp
+		gnokii
+		gnome-filesystem
+		gnome-icon-theme
+		gnome-keyring
+		gnome-mime-data
+		gnome-vfs2
+		gnutls
+		gpart
+		gpg
+		gpg2
+		gpgme
+		gpm
+		GraphicsMagick
+		grep
+		groff
+		grub
+		gsf-sharp
+		gstreamer010
+		gstreamer010-plugins-base
+		gtk
+		gtk2
+		gtk-sharp2
+		gtksourceview
+		gutenprint
+		gwenview
+		gzip
+		hal
+		hal-resmgr
+		hdparm
+		hfsutils
+		hplip
+		hplip-hpijs
+		htdig
+		hwinfo
+		id3lib
+		ifnteuro
+		ifplugd
+		ImageMagick
+		ImageMagick-Magick++
+		imlib
+		imlib2
+		imlib2-loaders
+		info
+		info2html
+		initviocons
+		insserv
+		inst-source-utils
+		intlfnts
+		iproute2
+		iptables
+		iputils
+		irqbalance
+		ispell
+		ispell-american
+		ispell-german
+		ispell-ngerman
+		jack
+		java-1_4_2-gcj-compat
+		java-1_5_0-sun
+		java-1_5_0-sun-plugin
+		jfsutils
+		joe
+		jpackage-utils
+		jpeg
+		k3b
+		kaffeine
+		kbd
+		kcm_gtk
+		kde3-i18n-de
+		kdeaddons3-kicker
+		kdeaddons3-konqueror
+		kdeartwork3-kscreensaver
+		kdeartwork3-xscreensaver
+		kdebase3
+		kdebase3-kdm
+		kdebase3-ksysguardd
+		kdebase3-nsplugin
+		kdebase3-samba
+		kdebase3-session
+		kdebase3-SuSE
+		kdebluetooth
+		kdegames3
+		kdegraphics3
+		kdegraphics3-kamera
+		kdegraphics3-pdf
+		kdegraphics3-postscript
+		kdegraphics3-scan
+		kdelibs3
+		kdelibs3-doc
+		kdemultimedia3
+		kdemultimedia3-CD
+		kdemultimedia3-mixer
+		kdenetwork3
+		kdenetwork3-InstantMessenger
+		kdenetwork3-news
+		kdenetwork3-vnc
+		kdepim3
+		kdepim3-kpilot
+		kdepim3-networkstatus
+		kdepim3-notes
+		kdetv
+		kdeutils3
+		kernel-default
+		kio_ipodslave
+		kio_iso
+		kio_slp
+		kipi-plugins
+		kitchensync
+		klogd
+		knights
+		koffice
+		koffice-i18n-de
+		koffice-i18n-de-doc
+		koffice-illustration
+		konversation
+		kpowersave
+		krb5
+		krecord
+		ksh
+		ksudoku
+		ksymoops
+		ktorrent
+		kwin-decor-suse2
+		lbreakout
+		ldapcpplib
+		less
+		libacl
+		libakode
+		libao
+		libapparmor
+		libart_lgpl
+		libattr
+		libbeagle
+		libbonobo
+		libbonoboui
+		libcap
+		libcom_err
+		libcroco
+		libdrm
+		libevent
+		libexif
+		libgcc41
+		libgcj41
+		libgcrypt
+		libgimpprint
+		libglade2
+		libgnome
+		libgnomecanvas
+		libgnomecups
+		libgnomeprint
+		libgnomeprintui
+		libgnomesu
+		libgnomeui
+		libgpg-error
+		libgphoto2
+		libgpod
+		libgsf
+		libgsf-gnome
+		libgssapi
+		libgtkhtml
+		libical
+		libicu
+		libidl
+		libidn
+		libieee1284
+		libjasper
+		libjpeg
+		libkexif
+		libkipi
+		libksba
+		liblazy
+		liblcms
+		libltdl
+		libmal
+		libmikmod
+		libmng
+		libmpcdec
+		libmtp
+		libmusicbrainz
+		libnetpbm
+		libnjb
+		libnl
+		libnscd
+		libofa
+		libogg
+		liboil
+		libopencdk
+		libopensync
+		libopensync-plugin-file
+		libopensync-plugin-gnokii
+		libopensync-plugin-gpe
+		libopensync-plugin-irmc
+		libopensync-plugin-kdepim
+		libopensync-plugin-opie
+		libopensync-plugin-palm
+		libopensync-plugin-sunbird
+		libopensync-plugin-syncml
+		libopensync-tools
+		libpcap
+		libpng
+		libqt4
+		libqt4-dbus-1
+		libqt4-qt3support
+		libqt4-sql
+		libqt4-x11
+		libqtpod
+		librpcsecgss
+		librsvg
+		libsamplerate
+		libsmbclient
+		libsndfile
+		libsoup
+		libstdc++41
+		libstroke
+		libsyncml
+		libtheora
+		libtiff
+		libtunepimp
+		libusb
+		libvisual
+		libvolume_id
+		libvorbis
+		libwmf
+		libwnck
+		libxcrypt
+		libxml2
+		libxslt
+		liby2util
+		libzio
+		libzypp
+		libzypp-zmd-backend
+		limal
+		limal-bootloader
+		limal-perl
+		logrotate
+		lsb
+		lsof
+		lua-libs
+		lukemftp
+		lvm2
+		lzo
+		m4
+		mailx
+		make
+		man
+		man-pages
+		manufacturer-PPDs
+		master-boot-code
+		mdadm
+		mDNSResponder-lib
+		Mesa
+		metacity
+		microcode_ctl
+		mingetty
+		mkinitrd
+		mkisofs
+		mktemp
+		module-init-tools
+		mono-core
+		mono-data
+		mono-data-sqlite
+		mono-web
+		MozillaFirefox
+		MozillaFirefox-translations
+		mozilla-nspr
+		mozilla-nss
+		mozilla-xulrunner181
+		multipath-tools
+		myspell-american
+		myspell-german
+		ncurses
+		neon
+		netcat
+		netcfg
+		netpbm
+		net-snmp
+		net-tools
+		NetworkManager
+		NetworkManager-kde
+		nfsidmap
+		nfs-utils
+		nscd
+		ntfsprogs
+		numlockx
+		ocrad
+		openal
+		openct
+		OpenEXR
+		openldap2-client
+		openobex
+		OpenOffice_org
+		OpenOffice_org-de
+		OpenOffice_org-kde
+		OpenOffice_org-Quickstarter
+		opensc
+		openslp
+		openssh
+		openssh-askpass
+		openssl
+		opensuse-manual_de
+		opensuse-manual_en
+		openSUSE-release
+		orbit2
+		pam
+		pam-config
+		pam-modules
+		pango
+		parted
+		patch
+		pax
+		pciutils
+		pciutils-ids
+		pcre
+		pcsc-lite
+		perl
+		perl-Bootloader
+		perl-Compress-Zlib
+		perl-Config-Crontab
+		perl-Crypt-SmbHash
+		perl-Crypt-SSLeay
+		perl-DBD-SQLite
+		perl-DBI
+		perl-Digest-HMAC
+		perl-Digest-MD4
+		perl-Digest-SHA1
+		perl-File-Tail
+		perl-gettext
+		perl-HTML-Parser
+		perl-HTML-Tagset
+		perl-IO-Zlib
+		perl-libwww-perl
+		perl-Net-Daemon
+		perl-Net-DNS
+		perl-Net-IP
+		perl-PlRPC
+		perl-spamassassin
+		perl-TermReadKey
+		perl-TimeDate
+		perl-URI
+		perl-XML-Parser
+		perl-XML-Writer
+		permissions
+		phalanx
+		pilot-link
+		pinentry
+		pinentry-qt
+		pkgconfig
+		pmtools
+		pm-utils
+		PolicyKit
+		poppler
+		poppler-qt
+		popt
+		portmap
+		postfix
+		powersave
+		powersave-libs
+		ppp
+		pptp
+		preload
+		procinfo
+		procmail
+		procps
+		providers
+		psmisc
+		pwdutils
+		python
+		python-qt
+		python-xml
+		qca
+		qlogic-firmware
+		qscintilla
+		qt3
+		qtcurve-gtk2
+		rdesktop
+		readline
+		RealPlayer
+		recode
+		reiserfs
+		release-notes
+		resmgr
+		rpm
+		rrdtool
+		rsync
+		ruby
+		sane
+		sane-frontends
+		sash
+		sax2
+		sax2-gui
+		sax2-ident
+		sax2-libsax
+		sax2-libsax-perl
+		sax2-tools
+		scpm
+		screen
+		scsi
+		SDL
+		SDL_image
+		SDL_mixer
+		SDL_net
+		SDL_Pango
+		SDL_perl
+		SDL_ttf
+		sed
+		sensors
+		sgml-skel
+		shared-mime-info
+		sharutils
+		siga
+		smartmontools
+		smpppd
+		spamassassin
+		speex
+		sqlite
+		sqlite2
+		sqlite-zmd
+		startup-notification
+		strace
+		sudo
+		supertux
+		suse-build-key
+		SuSEfirewall2
+		susehelp
+		susehelp_de
+		suseRegister
+		suspend
+		sysconfig
+		sysfsutils
+		syslog-ng
+		sysvinit
+		taglib
+		tar
+		tcl
+		tcpd
+		tcpdump
+		tcsh
+		telnet
+		terminfo
+		tightvnc
+		timezone
+		tk
+		udev
+		ufraw
+		ufraw-gimp
+		ulimit
+		unclutter
+		unzip
+		update-alternatives
+		usbutils
+		utempter
+		util-linux
+		v4l-conf
+		vim
+		w3m
+		wbxml2
+		wdiff
+		wget
+		wireless-tools
+		wodim
+		words
+		wpa_supplicant
+		wv
+		wvdial
+		wvstreams
+		x11-input-synaptics
+		x11-input-wacom
+		x11-tools
+		xaw3d
+		xdg-menu
+		xdg-utils
+		xdmbgrd
+		xfsprogs
+		xgl
+		xgl-hardware-list
+		xine-lib
+		xinetd
+		xkeyboard-config
+		xli
+		xlockmore
+		xmoto
+		xntp
+		xorg-x11
+		xorg-x11-driver-input
+		xorg-x11-driver-video
+		xorg-x11-fonts
+		xorg-x11-fonts-core
+		xorg-x11-libfontenc
+		xorg-x11-libICE
+		xorg-x11-libs
+		xorg-x11-libSM
+		xorg-x11-libX11
+		xorg-x11-libX11-ccache
+		xorg-x11-libXau
+		xorg-x11-libXdmcp
+		xorg-x11-libXext
+		xorg-x11-libXfixes
+		xorg-x11-libxkbfile
+		xorg-x11-libXmu
+		xorg-x11-libXp
+		xorg-x11-libXpm
+		xorg-x11-libXprintUtil
+		xorg-x11-libXrender
+		xorg-x11-libXt
+		xorg-x11-libXv
+		xorg-x11-server
+		xorg-x11-Xvnc
+		xpdf-tools
+		xscreensaver
+		xterm
+		xtermset
+		yast2
+		yast2-apparmor
+		yast2-backup
+		yast2-bluetooth
+		yast2-bootfloppy
+		yast2-bootloader
+		yast2-control-center
+		yast2-core
+		yast2-country
+		yast2-firewall
+		yast2-hardware-detection
+		yast2-inetd
+		yast2-installation
+		yast2-irda
+		yast2-iscsi-client
+		yast2-kerberos-client
+		yast2-ldap
+		yast2-ldap-client
+		yast2-mail
+		yast2-mail-aliases
+		yast2-mouse
+		yast2-ncurses
+		yast2-network
+		yast2-nfs-client
+		yast2-nis-client
+		yast2-ntp-client
+		yast2-online-update
+		yast2-online-update-frontend
+		yast2-packager
+		yast2-pam
+		yast2-perl-bindings
+		yast2-pkg-bindings
+		yast2-power-management
+		yast2-powertweak
+		yast2-printer
+		yast2-profile-manager
+		yast2-qt
+		yast2-registration
+		yast2-repair
+		yast2-restore
+		yast2-runlevel
+		yast2-samba-client
+		yast2-samba-server
+		yast2-scanner
+		yast2-schema
+		yast2-security
+		yast2-slp
+		yast2-sound
+		yast2-storage
+		yast2-storage-evms
+		yast2-storage-lib
+		yast2-sudo
+		yast2-support
+		yast2-sysconfig
+		yast2-theme-openSUSE
+		yast2-trans-de
+		yast2-transfer
+		yast2-trans-stats
+		yast2-tune
+		yast2-tv
+		yast2-update
+		yast2-users
+		yast2-x11
+		yast2-xml
+		ypbind
+		yp-tools
+		zip
+		zisofs-tools
+		zlib
+		zsh
+		zvbi
+	END
+</selection>
+<selection gnome>
+	base = textmode
+	packages = <<END
+	END
+</selection>
+<selection default>
+	base = minimal
+</selection>
diff --git a/lib/distro-info/suse-10.2_x86_64/settings.example b/lib/distro-info/suse-10.2_x86_64/settings.example
index 72af6e4e..c32b0514 100644
--- a/lib/distro-info/suse-10.2_x86_64/settings.example
+++ b/lib/distro-info/suse-10.2_x86_64/settings.example
@@ -20,3 +20,4 @@
 #	packages = <<END
 #		kinternet
 #	END
+#</selection>