* slxos-setup und die Metadaten der Systeme aktualisiert

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@704 95ad53e4-c205-0410-b2fa-d234c58c8868

5 files changed, 445 insertions, 8 deletions

diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
index 6e18939b..41d164c6 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
@@ -160,7 +160,271 @@ sub initDistroInfo
 	";
 
 	$self->{config}->{'selection'} = {
-		'default' => "list any packagenames here",
+		'default' => "
+			AdobeICCProfiles
+			BEAJava2-JRE
+			MozillaFirefox
+			MozillaFirefox-translations
+			NX
+			NetworkManager
+			NetworkManager-kde
+			OpenEXR
+			OpenEXR-32bit
+			OpenOffice_org
+			OpenOffice_org-Quickstarter
+			OpenOffice_org-kde
+			RealPlayer
+			aalib
+			aalib-32bit
+			acroread
+			amarok
+			amarok-helix
+			amarok-libvisual
+			apparmor-docs
+			apparmor-parser
+			apparmor-profiles
+			apparmor-utils
+			aspell
+			aspell-32bit
+			aspell-en
+			atk
+			atk-32bit
+			audit
+			audit-libs
+			beagle-firefox
+			beagle-index
+			cairo
+			cairo-32bit
+			cdparanoia
+			cdparanoia-32bit
+			crafty
+			cyrus-sasl-crammd5
+			cyrus-sasl-digestmd5
+			cyrus-sasl-plain
+			dejavu
+			desktop-data-SuSE
+			desktop-file-utils
+			dhcdbd
+			dhcp-client
+			digikam
+			digikam-doc
+			digikamimageplugins
+			dirmngr
+			dragonegg
+			dvd+rw-tools
+			efont-unicode
+			enscript
+			fam
+			fam-32bit
+			fam-server
+			flac
+			flac-32bit
+			flash-player
+			gconf2
+			gconf2-32bit
+			ghostscript-library
+			gimp
+			gimp-cmyk
+			glitz
+			glitz-32bit
+			gnome-mime-data
+			gnome-vfs2
+			gnome-vfs2-32bit
+			gnutls
+			gnutls-32bit
+			goom2k4
+			gpgme
+			gtk-qt-engine
+			gtk-qt-engine-32bit
+			gtk2
+			gtk2-32bit
+			gwenview
+			htdig
+			imlib2
+			imlib2-loaders
+			jack
+			jack-32bit
+			java-1_4_2-sun
+			java-1_4_2-sun-plugin
+			jpackage-utils
+			k3b
+			kaffeine
+			kdeaddons3-kate
+			kdeaddons3-kicker
+			kdeaddons3-konqueror
+			kdeartwork3-kscreensaver
+			kdeartwork3-sound
+			kdeartwork3-xscreensaver
+			kdebase3
+			kdebase3-32bit
+			kdebase3-SuSE
+			kdebase3-kdm
+			kdebase3-ksysguardd
+			kdebase3-nsplugin
+			kdebase3-samba
+			kdebase3-session
+			kdebindings3-python
+			kdebluetooth
+			kdegames3
+			kdegraphics3
+			kdegraphics3-fax
+			kdegraphics3-kamera
+			kdegraphics3-pdf
+			kdegraphics3-postscript
+			kdegraphics3-scan
+			kdelibs3
+			kdelibs3-32bit
+			kdemultimedia3
+			kdemultimedia3-CD
+			kdemultimedia3-mixer
+			kdenetwork3
+			kdenetwork3-InstantMessenger
+			kdenetwork3-news
+			kdenetwork3-vnc
+			kdepim3
+			kdepim3-kpilot
+			kdepim3-networkstatus
+			kdepim3-sync
+			kdetv
+			kdeutils3
+			kdeutils3-laptop
+			kerry
+			kio_beagle
+			kio_ipodslave
+			kio_slp
+			kipi-plugins
+			knights
+			konversation
+			kphone
+			kpowersave
+			krecord
+			kscpm
+			ktorrent
+			libapparmor
+			libapr0
+			libart_lgpl
+			libart_lgpl-32bit
+			libbonobo
+			libbonobo-32bit
+			libcddb
+			libcddb-32bit
+			libcdio
+			libcdio-32bit
+			libexif
+			libexif-32bit
+			libgcc-mainline
+			libgimpprint
+			libgnome
+			libgnome-32bit
+			libgphoto2
+			libgphoto2-32bit
+			libid3tag
+			libidl
+			libidl-32bit
+			libidn
+			libidn-32bit
+			libieee1284
+			libieee1284-32bit
+			libjasper
+			libjasper-32bit
+			libjpeg
+			libjpeg-32bit
+			libksba
+			liblcms
+			liblcms-32bit
+			libmng
+			libmng-32bit
+			libmusicbrainz
+			libnl
+			libogg
+			libogg-32bit
+			libopencdk
+			libopencdk-32bit
+			libpcap
+			libpng
+			libpng-32bit
+			libsmbclient
+			libsmbclient-32bit
+			libsndfile
+			libsndfile-32bit
+			libstdc++-mainline
+			libtheora
+			libtheora-32bit
+			libtool
+			libtool-32bit
+			libtunepimp
+			libvisual
+			libvisual-plugins
+			libvorbis
+			libvorbis-32bit
+			lzo
+			lzo-32bit
+			mDNSResponder
+			mDNSResponder-32bit
+			mDNSResponder-lib
+			mDNSResponder-lib-32bit
+			mkisofs
+			mozilla-nspr
+			mozilla-nspr-32bit
+			mozilla-nss
+			mozilla-nss-32bit
+			myspell-american
+			myspell-british
+			neon
+			neon-32bit
+			net-snmp
+			nvidiagl
+			orbit2
+			orbit2-32bit
+			pango
+			pango-32bit
+			perl-Net-Daemon
+			perl-PDA-Pilot
+			perl-PlRPC
+			perl-TermReadKey
+			pilot-link
+			pinentry
+			ppp
+			preload
+			psutils
+			python
+			python-32bit
+			python-xml
+			qt3
+			qt3-32bit
+			rrdtool
+			samba
+			samba-32bit
+			sane
+			sane-32bit
+			sensors
+			slang
+			slang-32bit
+			speex
+			speex-32bit
+			sqlite
+			sqlite-32bit
+			sqlite2
+			sqlite2-32bit
+			startup-notification
+			startup-notification-32bit
+			susehelp
+			taglib
+			taglib-32bit
+			unixODBC
+			unixODBC-32bit
+			vcdimager
+			vcdimager-32bit
+			vorbis-tools
+			wvstreams
+			xine-internal
+			xine-lib
+			xine-lib-32bit
+			xorg-modular
+			xscreensaver
+			yast2-apparmor
+			zvbi
+",
 	}
 }
 
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
index b5be8d2b..fd16e81e 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
@@ -164,7 +164,156 @@ sub initDistroInfo
 	";
 
 	$self->{config}->{'selection'} = {
-		'default' => "list any packagenames here",
+		'default' => "
+			3ddiag
+			915resolution
+			AdobeICCProfiles
+			CheckHardware
+			Crystalcursors
+			MozillaFirefox
+			MozillaFirefox-translations
+			NetworkManager
+			NetworkManager-kde
+			OpenOffice_org
+			OpenOffice_org-Quickstarter
+			OpenOffice_org-kde
+			RealPlayer
+			agfa-fonts
+			amarok
+			amarok-libvisual
+			amarok-xine
+			beagle-firefox
+			beagle-index
+			cabextract
+			chromium
+			compiz
+			dcraw
+			dejavu
+			desktop-data-SuSE
+			desktop-translations
+			efont-unicode
+			evms-gui
+			exiftool
+			flash-player
+			fontconfig
+			fonts-config
+			freeciv
+			freeglut
+			freetype
+			frozen-bubble
+			fvwm2
+			ghostscript-fonts-other
+			ghostscript-fonts-std
+			ghostscript-x11
+			gimp
+			gimp-help
+			ifnteuro
+			intlfnts
+			java-1_5_0-sun
+			java-1_5_0-sun-plugin
+			k3b
+			kaffeine
+			kcm_gtk
+			kdeaddons3-kicker
+			kdeaddons3-konqueror
+			kdeartwork3-kscreensaver
+			kdeartwork3-xscreensaver
+			kdebase3
+			kdebase3-SuSE
+			kdebase3-beagle
+			kdebase3-kdm
+			kdebase3-nsplugin
+			kdebase3-samba
+			kdebase3-session
+			kdebluetooth
+			kdegraphics3-pdf
+			kdelibs3
+			kdemultimedia3
+			kdemultimedia3-CD
+			kdemultimedia3-mixer
+			kdenetwork3
+			kdenetwork3-InstantMessenger
+			kdenetwork3-news
+			kdenetwork3-vnc
+			kdepim3
+			kdepim3-kpilot
+			kdepim3-networkstatus
+			kdepim3-notes
+			kdetv
+			kdeutils3
+			kerry
+			kio_beagle
+			kio_ipodslave
+			kio_iso
+			kio_slp
+			kitchensync
+			konversation
+			kpowersave
+			krecord
+			ktorrent
+			lbreakout
+			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
+			libqt4
+			libqt4-sql
+			libqt4-x11
+			lsb
+			mozilla-xulrunner181
+			numlockx
+			openssh-askpass
+			opensuse-manual_en
+			opensuse-quickstart_en
+			pinentry-qt
+			pkgconfig
+			preload
+			qtcurve-gtk2
+			sane-frontends
+			sax2
+			sax2-gui
+			supertux
+			susehelp
+			tcl
+			tightvnc
+			tk
+			ufraw
+			ufraw-gimp
+			unclutter
+			x11-input-synaptics
+			x11-input-wacom
+			x11-tools
+			xaw3d
+			xdg-menu
+			xdg-utils
+			xdmbgrd
+			xgl
+			xkeyboard-config
+			xlockmore
+			xmoto
+			xorg-x11
+			xorg-x11-Xvnc
+			xorg-x11-fonts
+			xorg-x11-fonts-core
+			xorg-x11-libX11
+			xorg-x11-libX11-ccache
+			xorg-x11-libXext
+			xorg-x11-libXrender
+			xorg-x11-server
+			xterm
+			xtermset
+			yast2-control-center
+			yast2-qt
+			yast2-sound
+			yast2-x11
+",
 	}
 }
 
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 52093cbd..f07689f9 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -26,7 +26,7 @@ use vars qw(%supportedDistros);
 %supportedDistros = (
 #	'debian-3.1' 		=> 'Debian_3_1',
 #	'debian-4.0' 		=> 'Debian_4_0',
-#	'fedora-6' 			=> 'Fedora_6',
+	'fedora-6' 			=> 'Fedora_6',
 #	'fedora-6-x86_64' 	=> 'Fedora_6_x86_64',
 #	'mandriva-2007.0' 	=> 'Mandriva_2007_0',
 #	'suse-9.3' 			=> 'SUSE_9_3',
@@ -35,7 +35,7 @@ use vars qw(%supportedDistros);
 	'suse-10.1' 		=> 'SUSE_10_1',
 #	'suse-10.1-x86_64' 	=> 'SUSE_10_1_x86_64',
 	'suse-10.2' 		=> 'SUSE_10_2',
-#	'suse-10.2-x86_64' 	=> 'SUSE_10_2_x86_64',
+	'suse-10.2-x86_64' 	=> 'SUSE_10_2_x86_64',
 #	'ubuntu-6.10' 		=> 'Ubuntu_6_10',
 );
 
@@ -190,7 +190,7 @@ sub readDistroInfo
 	if (-e $file) {
 		vlog 3, "reading configuration file $file...";
 		my $config = slurpFile($file);
-		if (!eval $config) {
+		if (!eval $config && length($@)) {
 			die _tr("error in config-file <%s> (%s)", $file, $@)."\n";
 		}
 	}
@@ -394,7 +394,9 @@ sub stage1A_copyTrustedPackageKeys
 	my $stage1cDir
 		= "$stage1bDir/$self->{'stage1cSubdir'}";
 	my $keyDir = "$self->{'distro-info-dir'}/trusted-package-keys";
-	copyFile("$keyDir/pubring.gpg", "$stage1cDir/usr/lib/rpm/gnupg");
+	if (-e "$keyDir/pubring.gpg") {
+		copyFile("$keyDir/pubring.gpg", "$stage1cDir/usr/lib/rpm/gnupg");
+	}
 }
 
 sub stage1A_createRequiredFiles
@@ -548,7 +550,16 @@ sub stage1D_installPackageSelection
 {
 	my $self = shift;
 
-	vlog 1, "installing package selection...";
+	my $selectionName = 'default';
+
+	vlog 1, "installing package selection <$selectionName>...";
+	my $pkgSelection = $self->{'distro-info'}->{selection}->{$selectionName};
+	my @pkgs
+		= grep { length($_) > 0 }
+		  map { $_ =~ s[^\s*(.+?)\s*$][$1]; $_ }
+		  split "\n", $pkgSelection;
+	$self->{'meta-packager'}->installSelection(join " ", @pkgs);
+
 }
 
 ################################################################################
diff --git a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
index 3673266d..72bed553 100644
--- a/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
+++ b/installer/OpenSLX/OSSetup/MetaPackager/yum.pm
@@ -49,6 +49,7 @@ sub setupPackageSource
 	}
 	my $repoDescr = "[$repoName]\nname=$repoInfo->{name}\nbaseurl=$repoURL\n";
 	system("cp /proc/cpuinfo $self->{engine}->{'system-path'}/proc");
+	system("rm -f $self->{engine}->{'system-path'}/etc/yum.repos.d/*");
 	system("mkdir -p $self->{engine}->{'system-path'}/etc/yum.repos.d");
 	my $repoFile
 		= "$self->{engine}->{'system-path'}/etc/yum.repos.d/$repoName.repo";
@@ -65,6 +66,16 @@ sub updateBasicSystem
 	if (system("yum -y update")) {
 		die _tr("unable to update basic system (%s)", $!);
 	}
+}
+
+sub installSelection
+{
+	my $self = shift;
+	my $pkgSelection = shift;
+
+	if (system("yum -y install $pkgSelection")) {
+		die _tr("unable to install selection (%s)", $!);
+	}
 	system('rm /proc/cpuinfo');
 }
 
diff --git a/installer/OpenSLX/OSSetup/Packager/rpm.pm b/installer/OpenSLX/OSSetup/Packager/rpm.pm
index 2fb2755b..0e431b37 100644
--- a/installer/OpenSLX/OSSetup/Packager/rpm.pm
+++ b/installer/OpenSLX/OSSetup/Packager/rpm.pm
@@ -36,7 +36,9 @@ sub unpackPackages
 	foreach my $pkg (@$pkgs) {
 		vlog 2, "unpacking package $pkg...";
 		if (system("ash", "-c", "rpm2cpio $pkg | cpio -i -d")) {
-			die _tr("unable to unpack package <%s> (%s)", $pkg, $!);
+			warn _tr("unable to unpack package <%s> (%s)", $pkg, $!);
+				# TODO: change this back to die() if cpio-ing fedora6-glibc
+				#       doesn't crash anymore... (needs busybox update, I suppose)
 		}
 	}
 }