* removed 'settings'-file from distro-info subfolders, as the user should never

  edit these anyway. The default configurations are now part of the distro-specific
  perl-module.


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

8 files changed, 272 insertions, 244 deletions

diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index cc0f7fd9..45fcf5fd 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -39,12 +39,18 @@ sub initialize
 
 	$self->{'stage1c-faked-files'} = [
 	];
+
+	$self->initDistroInfo();
 }
 
 sub fixPrerequiredFiles
 {
 }
 
+sub initDistroInfo
+{
+}
+
 1;
 ################################################################################
 
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
index ebf8902b..6e18939b 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_1.pm
@@ -49,4 +49,119 @@ sub fixPrerequiredFiles
 	}
 }
 
+sub initDistroInfo
+{
+	my $self = shift;
+	$self->{config}->{'repository'} = {
+		'base' => {
+			'urls' => "
+				http://ftp.gwdg.de/pub/opensuse/distribution/SL-10.1/inst-source
+				ftp://suse.inode.at/opensuse/distribution/SL-10.1/inst-source
+				http://mirrors.uol.com.br/pub/suse/distribution/SL-10.1/inst-source
+				ftp://klid.dk/opensuse/distribution/SL-10.1/inst-source
+				ftp://ftp.estpak.ee/pub/suse/opensuse/distribution/SL-10.1/inst-source
+				ftp://ftp.jaist.ac.jp/pub/Linux/openSUSE/distribution/SL-10.1/inst-source
+			",
+			'name' => 'SUSE Linux 10.1',
+			'repo-subdir' => 'suse',
+		},
+		'base_update' => {
+			'urls' => "
+				http://ftp.gwdg.de/pub/suse/update/10.1
+			",
+			'name' => 'SUSE Linux 10.1 updates',
+			'repo-subdir' => '',
+		},
+	};
+
+	$self->{config}->{'package-subdir'} = 'suse';
+
+	$self->{config}->{'prereq-packages'} = "
+		i586/bzip2-1.0.3-15.i586.rpm
+		i586/glibc-2.4-25.i586.rpm i586/glibc-2.4-31.1.i586.rpm
+		i586/popt-1.7-268.i586.rpm
+		i586/rpm-4.4.2-40.i586.rpm i586/rpm-4.4.2-43.4.i586.rpm
+		i586/zlib-1.2.3-13.i586.rpm
+	";
+
+	$self->{config}->{'bootstrap-prereq-packages'} = "";
+
+	$self->{config}->{'bootstrap-packages'} = "
+		i586/aaa_base-10.1-41.i586.rpm
+		i586/aaa_skel-2006.3.29-5.i586.rpm i586/aaa_skel-2006.5.19-0.2.i586.rpm
+		i586/ash-1.6.1-13.i586.rpm
+		i586/bash-3.1-22.i586.rpm i586/bash-3.1-24.3.i586.rpm
+		i586/blocxx-1.0.0-15.i586.rpm
+		i586/coreutils-5.93-20.i586.rpm
+		i586/cpio-2.6-17.i586.rpm
+		i586/cracklib-2.8.6-12.i586.rpm
+		i586/cyrus-sasl-2.1.21-18.i586.rpm
+		i586/db-4.3.29-13.i586.rpm
+		i586/diffutils-2.8.7-15.i586.rpm
+		i586/e2fsprogs-1.38-25.i586.rpm
+		i586/expat-2.0.0-11.i586.rpm
+		i586/file-4.16-13.i586.rpm i586/file-4.16-15.4.i586.rpm
+		i586/filesystem-10.1-5.i586.rpm
+		i586/fillup-1.42-116.i586.rpm
+		i586/findutils-4.2.27-12.i586.rpm
+		i586/gawk-3.1.5-18.i586.rpm
+		i586/gdbm-1.8.3-241.i586.rpm
+		i586/gpg-1.4.2-23.i586.rpm i586/gpg-1.4.2-23.7.i586.rpm
+		i586/grep-2.5.1a-18.i586.rpm
+		i586/gzip-1.3.5-157.i586.rpm i586/gzip-1.3.5-159.5.i586.rpm
+		i586/info-4.8-20.i586.rpm
+		i586/insserv-1.04.0-18.i586.rpm
+		i586/irqbalance-0.09-58.i586.rpm
+		i586/kernel-default-2.6.16.21-0.25.i586.rpm
+		i586/libacl-2.2.34-12.i586.rpm
+		i586/libattr-2.4.28-14.i586.rpm
+		i586/libcom_err-1.38-25.i586.rpm
+		i586/libgcc-4.1.0-25.i586.rpm
+		i586/libstdc++-4.1.0-25.i586.rpm
+		i586/libxcrypt-2.4-10.i586.rpm
+		i586/libzio-0.1-15.i586.rpm
+		i586/limal-1.1.6-8.i586.rpm
+		i586/limal-bootloader-1.1.2-7.i586.rpm
+		i586/limal-perl-1.1.6-8.i586.rpm
+		i586/logrotate-3.7.3-11.i586.rpm
+		i586/mdadm-2.2-30.i586.rpm
+		i586/mingetty-0.9.6s-86.i586.rpm
+		i586/mkinitrd-1.2-103.i586.rpm i586/mkinitrd-1.2-106.19.i586.rpm
+		i586/mktemp-1.5-742.i586.rpm
+		i586/module-init-tools-3.2.2-32.i586.rpm i586/module-init-tools-3.2.2-32.13.i586.rpm
+		i586/ncurses-5.5-16.i586.rpm
+		i586/net-tools-1.60-581.i586.rpm
+		i586/openldap2-client-2.3.19-18.i586.rpm
+		i586/openssl-0.9.8a-16.i586.rpm i586/openssl-0.9.8a-18.10.i586.rpm
+		i586/pam-0.99.3.0-25.i586.rpm i586/pam-0.99.3.0-29.3.i586.rpm
+		i586/pciutils-2.2.1-14.i586.rpm
+		i586/pcre-6.4-12.i586.rpm
+		i586/perl-5.8.8-12.i586.rpm
+		i586/perl-Bootloader-0.2.20-7.i586.rpm i586/perl-Bootloader-0.2.27-0.4.i586.rpm
+		i586/perl-gettext-1.05-11.i586.rpm
+		i586/permissions-2006.2.24-8.i586.rpm
+		i586/readline-5.1-22.i586.rpm
+		i586/reiserfs-3.6.19-17.i586.rpm
+		i586/sed-4.1.4-15.i586.rpm
+		i586/suse-release-10.1-9.i586.rpm
+		i586/sysvinit-2.86-19.i586.rpm
+		i586/udev-085-29.i586.rpm i586/udev-085-30.15.i586.rpm
+		i586/util-linux-2.12r-35.i586.rpm
+		noarch/suse-build-key-1.0-685.noarch.rpm
+		i586/libxml2-2.6.23-13.i586.rpm
+		i586/libxml2-python-2.6.23-15.i586.rpm
+		i586/python-2.4.2-18.i586.rpm
+		i586/python-elementtree-1.2.6-18.i586.rpm
+		i586/python-sqlite-1.1.6-17.i586.rpm
+		i586/python-urlgrabber-2.9.7-15.i586.rpm
+		i586/rpm-python-4.4.2-40.i586.rpm
+		i586/sqlite-3.2.8-14.i586.rpm
+		i586/yum-2.4.2-13.i586.rpm
+	";
+
+	$self->{config}->{'selection'} = {
+		'default' => "list any packagenames here",
+	}
+}
+
 1;
\ No newline at end of file
diff --git a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
index 59c2353c..b5be8d2b 100644
--- a/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
+++ b/installer/OpenSLX/OSSetup/Distro/SUSE_10_2.pm
@@ -49,4 +49,123 @@ sub fixPrerequiredFiles
 	}
 }
 
+sub initDistroInfo
+{
+	my $self = shift;
+	$self->{config}->{'repository'} = {
+		'base' => {
+			'urls' => "
+				http://ftp.gwdg.de/pub/opensuse/distribution/10.2/repo/oss
+				ftp://suse.inode.at/opensuse/distribution/10.2/repo/oss
+				http://mirrors.uol.com.br/pub/suse/distribution/10.2/repo/oss
+				ftp://klid.dk/opensuse/distribution/10.2/repo/oss
+				ftp://ftp.estpak.ee/pub/suse/opensuse/distribution/10.2/repo/oss
+				ftp://ftp.jaist.ac.jp/pub/Linux/openSUSE/distribution/10.2/repo/oss
+			",
+			'name' => 'openSUSE 10.2',
+			'repo-subdir' => 'suse',
+		},
+		'base_update' => {
+			'urls' => "
+				http://ftp.gwdg.de/pub/suse/update/10.2
+			",
+			'name' => 'openSUSE 10.2 updates',
+			'repo-subdir' => '',
+		},
+	};
+
+	$self->{config}->{'package-subdir'} = 'suse';
+
+	$self->{config}->{'prereq-packages'} = "
+		i586/bzip2-1.0.3-36.i586.rpm
+		i586/glibc-2.5-25.i586.rpm
+		i586/popt-1.7-304.i586.rpm
+		i586/rpm-4.4.2-76.i586.rpm
+		i586/zlib-1.2.3-33.i586.rpm
+	";
+
+	$self->{config}->{'bootstrap-prereq-packages'} = "";
+
+	$self->{config}->{'bootstrap-packages'} = "
+		i586/aaa_base-10.2-38.i586.rpm
+		i586/aaa_skel-2006.5.19-20.i586.rpm
+		i586/audit-libs-1.2.6-20.i586.rpm
+		i586/bash-3.1-55.i586.rpm
+		i586/blocxx-1.0.0-36.i586.rpm
+		i586/coreutils-6.4-10.i586.rpm
+		i586/cpio-2.6-40.i586.rpm
+		i586/cracklib-2.8.9-20.i586.rpm
+		i586/cyrus-sasl-2.1.22-28.i586.rpm
+		i586/db-4.4.20-16.i586.rpm
+		i586/diffutils-2.8.7-38.i586.rpm
+		i586/e2fsprogs-1.39-21.i586.rpm
+		i586/file-4.17-23.i586.rpm
+		i586/filesystem-10.2-22.i586.rpm
+		i586/fillup-1.42-138.i586.rpm
+		i586/findutils-4.2.28-24.i586.rpm
+		i586/gawk-3.1.5-41.i586.rpm
+		i586/gdbm-1.8.3-261.i586.rpm
+		i586/gpg-1.4.5-24.i586.rpm
+		i586/grep-2.5.1a-40.i586.rpm
+		i586/gzip-1.3.5-178.i586.rpm
+		i586/info-4.8-43.i586.rpm
+		i586/insserv-1.04.0-42.i586.rpm
+		i586/irqbalance-0.09-80.i586.rpm
+		i586/kernel-default-2.6.18.2-34.i586.rpm
+		i586/libacl-2.2.34-33.i586.rpm
+		i586/libattr-2.4.28-38.i586.rpm
+		i586/libcom_err-1.39-21.i586.rpm
+		i586/libgcc41-4.1.2_20061115-5.i586.rpm
+		i586/libstdc++41-4.1.2_20061115-5.i586.rpm
+		i586/libvolume_id-103-12.i586.rpm
+		i586/libxcrypt-2.4-30.i586.rpm
+		i586/libzio-0.2-20.i586.rpm
+		i586/limal-1.2.9-5.i586.rpm
+		i586/limal-bootloader-1.2.4-6.i586.rpm
+		i586/limal-perl-1.2.9-5.i586.rpm
+		i586/logrotate-3.7.4-21.i586.rpm
+		i586/mdadm-2.5.3-17.i586.rpm
+		i586/mingetty-0.9.6s-107.i586.rpm
+		i586/mkinitrd-1.2-149.i586.rpm
+		i586/mktemp-1.5-763.i586.rpm
+		i586/module-init-tools-3.2.2-62.i586.rpm
+		i586/ncurses-5.5-42.i586.rpm
+		i586/net-tools-1.60-606.i586.rpm
+		i586/openldap2-client-2.3.27-25.i586.rpm
+		i586/openssl-0.9.8d-17.i586.rpm
+		i586/openSUSE-release-10.2-35.i586.rpm
+		i586/pam-0.99.6.3-24.i586.rpm
+		i586/pciutils-2.2.4-13.i586.rpm
+		i586/pcre-6.7-21.i586.rpm
+		i586/perl-5.8.8-32.i586.rpm
+		i586/perl-Bootloader-0.4.5-3.i586.rpm
+		i586/perl-gettext-1.05-31.i586.rpm
+		i586/permissions-2006.11.13-5.i586.rpm
+		i586/readline-5.1-55.i586.rpm
+		i586/reiserfs-3.6.19-37.i586.rpm
+		i586/sed-4.1.5-21.i586.rpm
+		i586/sysvinit-2.86-47.i586.rpm
+		i586/udev-103-12.i586.rpm
+		i586/util-linux-2.12r-61.i586.rpm
+		noarch/pciutils-ids-2006.11.18-2.noarch.rpm
+		noarch/suse-build-key-1.0-707.noarch.rpm
+		i586/glib2-2.12.4-15.i586.rpm
+		i586/gnome-filesystem-0.1-288.i586.rpm
+		i586/libxml2-2.6.26-26.i586.rpm
+		i586/libxml2-python-2.6.26-29.i586.rpm
+		i586/rpm-python-4.4.2-76.i586.rpm
+		i586/python-2.5-19.i586.rpm
+		i586/python-sqlite-1.1.8-11.i586.rpm
+		i586/python-urlgrabber-3.1.0-18.i586.rpm
+		i586/python-xml-2.5-19.i586.rpm
+		i586/sqlite-3.3.8-14.i586.rpm
+		i586/yum-3.0.1-9.i586.rpm
+		i586/yum-metadata-parser-1.0.2-23.i586.rpm
+	";
+
+	$self->{config}->{'selection'} = {
+		'default' => "list any packagenames here",
+	}
+}
+
 1;
\ No newline at end of file
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index b17a094b..bd019b11 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -121,6 +121,9 @@ sub setupStage1
 
 	# parent, wait for child to do its work inside the chroot
 	waitpid($pid, 0);
+	if ($?) {
+		exit $?;
+	}
 	$self->stage1C_cleanupBasicSystem();
 	$self->setupStage1D();
 }
@@ -144,23 +147,23 @@ sub readDistroInfo
 	my $self = shift;
 
 	vlog 1, "reading configuration info for $self->{distro}->{'base-name'}...";
-	my (%repository,
-		%selection,
-		$base_url,
-		$package_subdir,
-		$prereq_packages,
-		$bootstrap_prereq_packages,
-		$bootstrap_packages);
-	foreach my $fn ('settings', 'settings.local') {
-		my $file = "$self->{'distro-info-dir'}/$fn";
-		if (-e $file) {
-			vlog 3, "reading configuration file $file...";
-			my $config = slurpFile($file);
-			if (!eval $config) {
-				die _tr("error in config-file <%s> (%s)", $file, $@)."\n";
-			}
+	# merge user-provided configuration distro defaults...
+	my %repository = %{$self->{distro}->{config}->{repository}};
+	my %selection = %{$self->{distro}->{config}->{selection}};
+	my $package_subdir = $self->{distro}->{config}->{'package-subdir'};
+	my $prereq_packages = $self->{distro}->{config}->{'prereq-packages'};
+	my $bootstrap_prereq_packages
+		= $self->{distro}->{config}->{'bootstrap-prereq-packages'};
+	my $bootstrap_packages = $self->{distro}->{config}->{'bootstrap-packages'};
+	my $file = "$self->{'distro-info-dir'}/settings.local";
+	if (-e $file) {
+		vlog 3, "reading configuration file $file...";
+		my $config = slurpFile($file);
+		if (!eval $config) {
+			die _tr("error in config-file <%s> (%s)", $file, $@)."\n";
 		}
 	}
+	# ...and store merged config:
 	$self->{'distro-info'} = {
 		'package-subdir' => $package_subdir,
 		'prereq-packages' => $prereq_packages,
@@ -169,8 +172,9 @@ sub readDistroInfo
 		'repository' => \%repository,
 		'selection' => \%selection,
 	};
+
 	if ($openslxConfig{'verbose-level'} >= 2) {
-		# dump distro-info:
+		# dump distro-info, if asked for:
 		foreach my $r (sort keys %repository) {
 			vlog 2, "repository '$r':";
 			foreach my $k (sort keys %{$repository{$r}}) {
@@ -577,8 +581,9 @@ sub string2Array
 	my $str = shift;
 
 	return
+		grep { length($_) > 0 }
 		map { $_ =~ s[^\s*(.+?)\s*$][$1]; $_ }
-		grep { length($_) > 0 } split "\n", $str;
+		split "\n", $str;
 }
 
 sub downloadFilesFrom
@@ -588,9 +593,10 @@ sub downloadFilesFrom
 
 	my @foundFiles;
 	foreach my $fileVariantStr (@$files) {
+		next unless $fileVariantStr =~ m[\S];
 		my $foundFile;
 		foreach my $file (split '\s+', $fileVariantStr) {
-		vlog 2, "fetching $file...";
+			vlog 2, "fetching <$file>...";
 			if (system("wget", "$baseURL/$file") == 0) {
 				$foundFile = basename($file);
 				last;
diff --git a/lib/distro-info/suse-10.1/settings b/lib/distro-info/suse-10.1/settings
deleted file mode 100644
index b4b7d219..00000000
--- a/lib/distro-info/suse-10.1/settings
+++ /dev/null
@@ -1,107 +0,0 @@
-$repository{base} = {
-	'urls' => "
-		http://ftp.gwdg.de/pub/opensuse/distribution/SL-10.1/inst-source
-		ftp://suse.inode.at/opensuse/distribution/SL-10.1/inst-source
-		http://mirrors.uol.com.br/pub/suse/distribution/SL-10.1/inst-source
-		ftp://klid.dk/opensuse/distribution/SL-10.1/inst-source
-		ftp://ftp.estpak.ee/pub/suse/opensuse/distribution/SL-10.1/inst-source
-		ftp://ftp.jaist.ac.jp/pub/Linux/openSUSE/distribution/SL-10.1/inst-source
-	",
-	'name' => 'SUSE Linux 10.1',
-	'repo-subdir' => 'suse',
-};
-
-$repository{base_update} = {
-	'urls' => "
-		http://ftp.gwdg.de/pub/suse/update/10.1
-	",
-	'name' => 'SUSE Linux 10.1 updates',
-	'repo-subdir' => '',
-};
-
-$package_subdir = 'suse';
-
-$prereq_packages = "
-	i586/bzip2-1.0.3-15.i586.rpm
-	i586/glibc-2.4-25.i586.rpm i586/glibc-2.4-31.1.i586.rpm
-	i586/popt-1.7-268.i586.rpm
-	i586/rpm-4.4.2-40.i586.rpm i586/rpm-4.4.2-43.4.i586.rpm
-	i586/zlib-1.2.3-13.i586.rpm
-";
-
-$bootstrap_prereq_packages = "";
-
-$bootstrap_packages = "
-	i586/aaa_base-10.1-41.i586.rpm
-	i586/aaa_skel-2006.3.29-5.i586.rpm i586/aaa_skel-2006.5.19-0.2.i586.rpm
-	i586/ash-1.6.1-13.i586.rpm
-	i586/bash-3.1-22.i586.rpm i586/bash-3.1-24.3.i586.rpm
-	i586/blocxx-1.0.0-15.i586.rpm
-	i586/coreutils-5.93-20.i586.rpm
-	i586/cpio-2.6-17.i586.rpm
-	i586/cracklib-2.8.6-12.i586.rpm
-	i586/cyrus-sasl-2.1.21-18.i586.rpm
-	i586/db-4.3.29-13.i586.rpm
-	i586/diffutils-2.8.7-15.i586.rpm
-	i586/e2fsprogs-1.38-25.i586.rpm
-	i586/expat-2.0.0-11.i586.rpm
-	i586/file-4.16-13.i586.rpm i586/file-4.16-15.4.i586.rpm
-	i586/filesystem-10.1-5.i586.rpm
-	i586/fillup-1.42-116.i586.rpm
-	i586/findutils-4.2.27-12.i586.rpm
-	i586/gawk-3.1.5-18.i586.rpm
-	i586/gdbm-1.8.3-241.i586.rpm
-	i586/gpg-1.4.2-23.i586.rpm i586/gpg-1.4.2-23.7.i586.rpm
-	i586/grep-2.5.1a-18.i586.rpm
-	i586/gzip-1.3.5-157.i586.rpm i586/gzip-1.3.5-159.5.i586.rpm
-	i586/info-4.8-20.i586.rpm
-	i586/insserv-1.04.0-18.i586.rpm
-	i586/irqbalance-0.09-58.i586.rpm
-	i586/kernel-default-2.6.16.21-0.25.i586.rpm
-	i586/libacl-2.2.34-12.i586.rpm
-	i586/libattr-2.4.28-14.i586.rpm
-	i586/libcom_err-1.38-25.i586.rpm
-	i586/libgcc-4.1.0-25.i586.rpm
-	i586/libstdc++-4.1.0-25.i586.rpm
-	i586/libxcrypt-2.4-10.i586.rpm
-	i586/libzio-0.1-15.i586.rpm
-	i586/limal-1.1.6-8.i586.rpm
-	i586/limal-bootloader-1.1.2-7.i586.rpm
-	i586/limal-perl-1.1.6-8.i586.rpm
-	i586/logrotate-3.7.3-11.i586.rpm
-	i586/mdadm-2.2-30.i586.rpm
-	i586/mingetty-0.9.6s-86.i586.rpm
-	i586/mkinitrd-1.2-103.i586.rpm i586/mkinitrd-1.2-106.19.i586.rpm
-	i586/mktemp-1.5-742.i586.rpm
-	i586/module-init-tools-3.2.2-32.i586.rpm i586/module-init-tools-3.2.2-32.13.i586.rpm
-	i586/ncurses-5.5-16.i586.rpm
-	i586/net-tools-1.60-581.i586.rpm
-	i586/openldap2-client-2.3.19-18.i586.rpm
-	i586/openssl-0.9.8a-16.i586.rpm i586/openssl-0.9.8a-18.10.i586.rpm
-	i586/pam-0.99.3.0-25.i586.rpm i586/pam-0.99.3.0-29.3.i586.rpm
-	i586/pciutils-2.2.1-14.i586.rpm
-	i586/pcre-6.4-12.i586.rpm
-	i586/perl-5.8.8-12.i586.rpm
-	i586/perl-Bootloader-0.2.20-7.i586.rpm i586/perl-Bootloader-0.2.27-0.4.i586.rpm
-	i586/perl-gettext-1.05-11.i586.rpm
-	i586/permissions-2006.2.24-8.i586.rpm
-	i586/readline-5.1-22.i586.rpm
-	i586/reiserfs-3.6.19-17.i586.rpm
-	i586/sed-4.1.4-15.i586.rpm
-	i586/suse-release-10.1-9.i586.rpm
-	i586/sysvinit-2.86-19.i586.rpm
-	i586/udev-085-29.i586.rpm i586/udev-085-30.15.i586.rpm
-	i586/util-linux-2.12r-35.i586.rpm
-	noarch/suse-build-key-1.0-685.noarch.rpm
-	i586/libxml2-2.6.23-13.i586.rpm
-	i586/libxml2-python-2.6.23-15.i586.rpm
-	i586/python-2.4.2-18.i586.rpm
-	i586/python-elementtree-1.2.6-18.i586.rpm
-	i586/python-sqlite-1.1.6-17.i586.rpm
-	i586/python-urlgrabber-2.9.7-15.i586.rpm
-	i586/rpm-python-4.4.2-40.i586.rpm
-	i586/sqlite-3.2.8-14.i586.rpm
-	i586/yum-2.4.2-13.i586.rpm
-";
-
-$selection{default} = "list any packagenames here";
diff --git a/lib/distro-info/suse-10.1/settings.local b/lib/distro-info/suse-10.1/settings.local
index cfd2e2cf..957876e8 100644
--- a/lib/distro-info/suse-10.1/settings.local
+++ b/lib/distro-info/suse-10.1/settings.local
@@ -3,6 +3,6 @@ $repository{base}->{url} = 'ftp://localhost/pub/opensuse/distribution/SL-10.1/in
 $repository{base_update}->{url} = 'ftp://localhost/pub/suse/update/10.1';
 
 # Add a new selection:
-$selection{kde} = "$selection{default} kdepim3
-even more packagenames here
-and more";
+# $selection{'my-kde'} = "$selection{default}
+# foo
+# bar";
diff --git a/lib/distro-info/suse-10.2/settings b/lib/distro-info/suse-10.2/settings
deleted file mode 100644
index 98521087..00000000
--- a/lib/distro-info/suse-10.2/settings
+++ /dev/null
@@ -1,111 +0,0 @@
-$repository{base} = {
-	'urls' => "
-		http://ftp.gwdg.de/pub/opensuse/distribution/10.2/repo/oss
-		ftp://suse.inode.at/opensuse/distribution/10.2/repo/oss
-		http://mirrors.uol.com.br/pub/suse/distribution/10.2/repo/oss
-		ftp://klid.dk/opensuse/distribution/10.2/repo/oss
-		ftp://ftp.estpak.ee/pub/suse/opensuse/distribution/10.2/repo/oss
-		ftp://ftp.jaist.ac.jp/pub/Linux/openSUSE/distribution/10.2/repo/oss
-	",
-	'name' => 'openSUSE 10.2',
-	'repo-subdir' => '',
-};
-
-$repository{base_update} = {
-	'urls' => "
-		http://ftp.gwdg.de/pub/suse/update/10.2
-	",
-	'name' => 'openSUSE 10.2 updates',
-	'repo-subdir' => 'suse',
-};
-
-$package_subdir = 'suse';
-
-$prereq_packages = "
-	i586/bzip2-1.0.3-36.i586.rpm
-	i586/glibc-2.5-25.i586.rpm
-	i586/popt-1.7-304.i586.rpm
-	i586/rpm-4.4.2-76.i586.rpm
-	i586/zlib-1.2.3-33.i586.rpm
-";
-
-$bootstrap_prereq_packages = "";
-
-$bootstrap_packages = "
-	i586/aaa_base-10.2-38.i586.rpm
-	i586/aaa_skel-2006.5.19-20.i586.rpm
-	i586/audit-libs-1.2.6-20.i586.rpm
-	i586/bash-3.1-55.i586.rpm
-	i586/blocxx-1.0.0-36.i586.rpm
-	i586/coreutils-6.4-10.i586.rpm
-	i586/cpio-2.6-40.i586.rpm
-	i586/cracklib-2.8.9-20.i586.rpm
-	i586/cyrus-sasl-2.1.22-28.i586.rpm
-	i586/db-4.4.20-16.i586.rpm
-	i586/diffutils-2.8.7-38.i586.rpm
-	i586/e2fsprogs-1.39-21.i586.rpm
-	i586/file-4.17-23.i586.rpm
-	i586/filesystem-10.2-22.i586.rpm
-	i586/fillup-1.42-138.i586.rpm
-	i586/findutils-4.2.28-24.i586.rpm
-	i586/gawk-3.1.5-41.i586.rpm
-	i586/gdbm-1.8.3-261.i586.rpm
-	i586/gpg-1.4.5-24.i586.rpm
-	i586/grep-2.5.1a-40.i586.rpm
-	i586/gzip-1.3.5-178.i586.rpm
-	i586/info-4.8-43.i586.rpm
-	i586/insserv-1.04.0-42.i586.rpm
-	i586/irqbalance-0.09-80.i586.rpm
-	i586/kernel-default-2.6.18.2-34.i586.rpm
-	i586/libacl-2.2.34-33.i586.rpm
-	i586/libattr-2.4.28-38.i586.rpm
-	i586/libcom_err-1.39-21.i586.rpm
-	i586/libgcc41-4.1.2_20061115-5.i586.rpm
-	i586/libstdc++41-4.1.2_20061115-5.i586.rpm
-	i586/libvolume_id-103-12.i586.rpm
-	i586/libxcrypt-2.4-30.i586.rpm
-	i586/libzio-0.2-20.i586.rpm
-	i586/limal-1.2.9-5.i586.rpm
-	i586/limal-bootloader-1.2.4-6.i586.rpm
-	i586/limal-perl-1.2.9-5.i586.rpm
-	i586/logrotate-3.7.4-21.i586.rpm
-	i586/mdadm-2.5.3-17.i586.rpm
-	i586/mingetty-0.9.6s-107.i586.rpm
-	i586/mkinitrd-1.2-149.i586.rpm
-	i586/mktemp-1.5-763.i586.rpm
-	i586/module-init-tools-3.2.2-62.i586.rpm
-	i586/ncurses-5.5-42.i586.rpm
-	i586/net-tools-1.60-606.i586.rpm
-	i586/openldap2-client-2.3.27-25.i586.rpm
-	i586/openssl-0.9.8d-17.i586.rpm
-	i586/openSUSE-release-10.2-35.i586.rpm
-	i586/pam-0.99.6.3-24.i586.rpm
-	i586/pciutils-2.2.4-13.i586.rpm
-	i586/pcre-6.7-21.i586.rpm
-	i586/perl-5.8.8-32.i586.rpm
-	i586/perl-Bootloader-0.4.5-3.i586.rpm
-	i586/perl-gettext-1.05-31.i586.rpm
-	i586/permissions-2006.11.13-5.i586.rpm
-	i586/readline-5.1-55.i586.rpm
-	i586/reiserfs-3.6.19-37.i586.rpm
-	i586/sed-4.1.5-21.i586.rpm
-	i586/sysvinit-2.86-47.i586.rpm
-	i586/udev-103-12.i586.rpm
-	i586/util-linux-2.12r-61.i586.rpm
-	noarch/pciutils-ids-2006.11.18-2.noarch.rpm
-	noarch/suse-build-key-1.0-707.noarch.rpm
-	i586/glib2-2.12.4-15.i586.rpm
-	i586/gnome-filesystem-0.1-288.i586.rpm
-	i586/libxml2-2.6.26-26.i586.rpm
-	i586/libxml2-python-2.6.26-29.i586.rpm
-	i586/rpm-python-4.4.2-76.i586.rpm
-	i586/python-2.5-19.i586.rpm
-	i586/python-sqlite-1.1.8-11.i586.rpm
-	i586/python-urlgrabber-3.1.0-18.i586.rpm
-	i586/python-xml-2.5-19.i586.rpm
-	i586/sqlite-3.3.8-14.i586.rpm
-	i586/yum-3.0.1-9.i586.rpm
-	i586/yum-metadata-parser-1.0.2-23.i586.rpm
-";
-
-$selection{default} = "list any packagenames here";
diff --git a/lib/distro-info/suse-10.2/settings.local b/lib/distro-info/suse-10.2/settings.local
index 12750a41..bd5c529d 100644
--- a/lib/distro-info/suse-10.2/settings.local
+++ b/lib/distro-info/suse-10.2/settings.local
@@ -1,8 +1,8 @@
 # Use local installation sources.
-# $repository{base}->{url} = "ftp://gab/pub/opensuse/distribution/10.2/repo/oss";
-# $repository{update}->{url} = "ftp://gab/pub/suse/update/10.2";
+$repository{base}->{url} = "ftp://localhost/pub/opensuse/distribution/10.2/repo/oss";
+$repository{base_update}->{url} = "ftp://localhost/pub/suse/update/10.2";
 
 # Add a new selection:
-$selection{kde} = "$selection{default} kdepim3
-even more packagenames here
-and more";
+# $selection{'my-kde'} = "$selection{default}
+# foo
+# bar";