* Switched indent used in Perl-code and settings files from tabs to 4 spaces.

  May need some manual corrections here and there, but should basically be ok.

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

43 files changed, 7606 insertions, 7606 deletions

diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm
index e5a57b15..a9e017d2 100644
--- a/lib/OpenSLX/Basics.pm
+++ b/lib/OpenSLX/Basics.pm
@@ -9,7 +9,7 @@
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
 # Basics.pm
-#	- provides basic functionality of the OpenSLX config-db.
+#    - provides basic functionality of the OpenSLX config-db.
 # -----------------------------------------------------------------------------
 package OpenSLX::Basics;
 
@@ -23,14 +23,14 @@ $VERSION = 1.01;
 @ISA     = qw(Exporter);
 
 @EXPORT = qw(
-	&openslxInit %openslxConfig %cmdlineConfig
-	&_tr &trInit
-	&warn &die &croak &carp &confess &cluck
-	&callInSubprocess &executeInSubprocess &slxsystem
-	&vlog
-	&checkParams
-	&instantiateClass
-	&addCleanupFunction &removeCleanupFunction
+    &openslxInit %openslxConfig %cmdlineConfig
+    &_tr &trInit
+    &warn &die &croak &carp &confess &cluck
+    &callInSubprocess &executeInSubprocess &slxsystem
+    &vlog
+    &checkParams
+    &instantiateClass
+    &addCleanupFunction &removeCleanupFunction
 );
 
 our (%openslxConfig, %cmdlineConfig, %openslxPath);
@@ -42,8 +42,8 @@ use open ':utf8';
 ################################################################################
 ### Module implementation
 ################################################################################
-require Carp;		# do not import anything as we are going to overload carp
-					# and croak!
+require Carp;        # do not import anything as we are going to overload carp
+                    # and croak!
 use Carp::Heavy;    # use it here to have it loaded immediately, not at
                     # the time when carp() is being invoked (which might
                     # be at a point in time where the script executes in
@@ -62,80 +62,80 @@ my $translations;
 # the initial content is based on environment variables or default values.
 # Each value may be overridden from config files and/or cmdline arguments.
 %openslxConfig = (
-	'db-name' => $ENV{SLX_DB_NAME} || 'openslx',
-	'db-spec' => $ENV{SLX_DB_SPEC},
-	'db-type' => $ENV{SLX_DB_TYPE} || 'SQLite',
-	'locale'         => setlocale(LC_MESSAGES),
-	'locale-charmap' => `locale charmap`,
-	'base-path'      => $ENV{SLX_BASE_PATH} || '/opt/openslx',
-	'config-path'    => $ENV{SLX_CONFIG_PATH} || '/etc/opt/openslx',
-	'private-path'   => $ENV{SLX_PRIVATE_PATH} || '/var/opt/openslx',
-	'public-path'    => $ENV{SLX_PUBLIC_PATH} || '/srv/openslx',
-	'temp-path'      => $ENV{SLX_TEMP_PATH} || '/tmp',
-	'verbose-level'  => $ENV{SLX_VERBOSE_LEVEL} || '0',
-
-	#
-	# options useful during development only:
-	#
-	'debug-confess' => '0',
-
-	#
-	# extended settings follow, which are only supported by slxsettings,
-	# but not by any other script:
-	#
-	'db-user'                            => undef,
-	'db-passwd'                          => undef,
-	'default-shell'                      => 'bash',
-	'default-timezone'                   => 'Europe/Berlin',
-	'mirrors-preferred-top-level-domain' => undef,
-	'mirrors-to-try-count'               => '20',
-	'mirrors-to-use-count'               => '5',
-	'ossetup-max-try-count'              => '5',
-	'pxe-theme'                          => undef,
-	'pxe-theme-menu-margin'              => '9',
+    'db-name' => $ENV{SLX_DB_NAME} || 'openslx',
+    'db-spec' => $ENV{SLX_DB_SPEC},
+    'db-type' => $ENV{SLX_DB_TYPE} || 'SQLite',
+    'locale'         => setlocale(LC_MESSAGES),
+    'locale-charmap' => `locale charmap`,
+    'base-path'      => $ENV{SLX_BASE_PATH} || '/opt/openslx',
+    'config-path'    => $ENV{SLX_CONFIG_PATH} || '/etc/opt/openslx',
+    'private-path'   => $ENV{SLX_PRIVATE_PATH} || '/var/opt/openslx',
+    'public-path'    => $ENV{SLX_PUBLIC_PATH} || '/srv/openslx',
+    'temp-path'      => $ENV{SLX_TEMP_PATH} || '/tmp',
+    'verbose-level'  => $ENV{SLX_VERBOSE_LEVEL} || '0',
+
+    #
+    # options useful during development only:
+    #
+    'debug-confess' => '0',
+
+    #
+    # extended settings follow, which are only supported by slxsettings,
+    # but not by any other script:
+    #
+    'db-user'                            => undef,
+    'db-passwd'                          => undef,
+    'default-shell'                      => 'bash',
+    'default-timezone'                   => 'Europe/Berlin',
+    'mirrors-preferred-top-level-domain' => undef,
+    'mirrors-to-try-count'               => '20',
+    'mirrors-to-use-count'               => '5',
+    'ossetup-max-try-count'              => '5',
+    'pxe-theme'                          => undef,
+    'pxe-theme-menu-margin'              => '9',
 );
 chomp($openslxConfig{'locale-charmap'});
 
 # specification of cmdline arguments that are shared by all openslx-scripts:
 my %openslxCmdlineArgs = (
 
-	# name of database, defaults to 'openslx'
-	'db-name=s' => \$cmdlineConfig{'db-name'},
+    # name of database, defaults to 'openslx'
+    'db-name=s' => \$cmdlineConfig{'db-name'},
 
-	# full specification of database, a special string defining the
-	# precise database to connect to (the contents of this string
-	# depend on db-type)
-	'db-spec=s' => \$cmdlineConfig{'db-spec'},
+    # full specification of database, a special string defining the
+    # precise database to connect to (the contents of this string
+    # depend on db-type)
+    'db-spec=s' => \$cmdlineConfig{'db-spec'},
 
-	# type of database to connect to (SQLite, mysql, ...), defaults to 'SQLite'
-	'db-type=s' => \$cmdlineConfig{'db-type'},
+    # type of database to connect to (SQLite, mysql, ...), defaults to 'SQLite'
+    'db-type=s' => \$cmdlineConfig{'db-type'},
 
-	# activates debug mode, this will show the lines where any error occured
-	# (followed by a stacktrace):
-	'debug-confess' => \$cmdlineConfig{'debug-confess'},
+    # activates debug mode, this will show the lines where any error occured
+    # (followed by a stacktrace):
+    'debug-confess' => \$cmdlineConfig{'debug-confess'},
 
-	# locale to use for translations
-	'locale=s' => \$cmdlineConfig{'locale'},
+    # locale to use for translations
+    'locale=s' => \$cmdlineConfig{'locale'},
 
-	# locale-charmap to use for I/O (iso-8859-1, utf-8, etc.)
-	'locale-charmap=s' => \$cmdlineConfig{'locale-charmap'},
+    # locale-charmap to use for I/O (iso-8859-1, utf-8, etc.)
+    'locale-charmap=s' => \$cmdlineConfig{'locale-charmap'},
 
-	# file to write logging output to, defaults to STDERR
-	'logfile=s' => \$cmdlineConfig{'locale'},
+    # file to write logging output to, defaults to STDERR
+    'logfile=s' => \$cmdlineConfig{'locale'},
 
-	# path to private data (which is *not* accesible by clients and contains
-	# database, vendorOSes and all local extensions [system specific scripts])
-	'private-path=s' => \$cmdlineConfig{'private-path'},
+    # path to private data (which is *not* accesible by clients and contains
+    # database, vendorOSes and all local extensions [system specific scripts])
+    'private-path=s' => \$cmdlineConfig{'private-path'},
 
-	# path to public data (which is accesible by clients and contains
-	# PXE-configurations, kernels, initramfs and client configurations)
-	'public-path=s' => \$cmdlineConfig{'public-path'},
+    # path to public data (which is accesible by clients and contains
+    # PXE-configurations, kernels, initramfs and client configurations)
+    'public-path=s' => \$cmdlineConfig{'public-path'},
 
-	# path to temporary data (used during demuxing)
-	'temp-path=s' => \$cmdlineConfig{'temp-path'},
+    # path to temporary data (used during demuxing)
+    'temp-path=s' => \$cmdlineConfig{'temp-path'},
 
-	# level of logging verbosity (0-3)
-	'verbose-level=i' => \$cmdlineConfig{'verbose-level'},
+    # level of logging verbosity (0-3)
+    'verbose-level=i' => \$cmdlineConfig{'verbose-level'},
 );
 
 my %cleanupFunctions;
@@ -148,344 +148,344 @@ $Carp::CarpLevel = 1;
 # ------------------------------------------------------------------------------
 sub vlog
 {
-	my $minLevel = shift;
-	return if $minLevel > $openslxConfig{'verbose-level'};
-	my $str = join("", '-' x $minLevel, @_);
-	if (substr($str, -1, 1) ne "\n") {
-		$str .= "\n";
-	}
-	print $openslxLog $str;
-	return;
+    my $minLevel = shift;
+    return if $minLevel > $openslxConfig{'verbose-level'};
+    my $str = join("", '-' x $minLevel, @_);
+    if (substr($str, -1, 1) ne "\n") {
+        $str .= "\n";
+    }
+    print $openslxLog $str;
+    return;
 }
 
 # ------------------------------------------------------------------------------
 sub openslxInit
 {
-	# evaluate cmdline arguments:
-	Getopt::Long::Configure('no_pass_through');
-	GetOptions(%openslxCmdlineArgs);
-
-	# try to read and evaluate config files:
-	my $configPath = $cmdlineConfig{'config-path'}
-	  || $openslxConfig{'config-path'};
-	my $sharePath = "$openslxConfig{'base-path'}/share";
-	my $verboseLevel = $cmdlineConfig{'verbose-level'} || 0;
-	foreach my $f ("$sharePath/settings.default", "$configPath/settings",
-		"$ENV{HOME}/.openslx/settings")
-	{
-		next unless -e $f;
-		if ($verboseLevel >= 2) {
-			vlog(0, "reading config-file $f...");
-		}
-		my $configObject = Config::General->new(
-			-AutoTrue       => 1, 
-			-ConfigFile     => $f, 
-			-LowerCaseNames => 1,
-			-SplitPolicy    => 'equalsign',
-		);
-		my %config = $configObject->getall();
-		foreach my $key (keys %config) {
-			# N.B.: these config files are used by shell-scripts, too, so in
-			# order to comply with shell-style, the config files use shell
-			# syntax and an uppercase, underline-as-separator format.
-			# Internally, we use lowercase, minus-as-separator format, so we
-			# need to convert the environment variable names to our own
-			# internal style here (e.g. 'SLX_BASE_PATH' to 'base-path'):
-			my $ourKey = $key;
-			$ourKey =~ s[^slx_][];
-			$ourKey =~ tr/_/-/;
-			$openslxConfig{$ourKey} = $config{$key};
-		}
-	}
-
-	# push any cmdline argument into our config hash, possibly overriding any
-	# setting from the config files:
-	while (my ($key, $val) = each(%cmdlineConfig)) {
-		next unless defined $val;
-		$openslxConfig{$key} = $val;
-	}
-
-	if (defined $openslxConfig{'logfile'}) {
-		open($openslxLog, '>>', $openslxConfig{'logfile'})
-		  or croak(
-			_tr(
-				"unable to append to logfile '%s'! (%s)",    
-				$openslxConfig{'logfile'}, $!
-			)
-		  );
-	}
-	if ($openslxConfig{'verbose-level'} >= 2) {
-		foreach my $key (sort keys %openslxConfig) {
-			my $val = $openslxConfig{$key} || '';
-			vlog(2, "config-dump: $key = $val");
-		}
-	}
-
-	# setup translation "engine":
-	trInit();
-
-	return 1;
+    # evaluate cmdline arguments:
+    Getopt::Long::Configure('no_pass_through');
+    GetOptions(%openslxCmdlineArgs);
+
+    # try to read and evaluate config files:
+    my $configPath = $cmdlineConfig{'config-path'}
+      || $openslxConfig{'config-path'};
+    my $sharePath = "$openslxConfig{'base-path'}/share";
+    my $verboseLevel = $cmdlineConfig{'verbose-level'} || 0;
+    foreach my $f ("$sharePath/settings.default", "$configPath/settings",
+        "$ENV{HOME}/.openslx/settings")
+    {
+        next unless -e $f;
+        if ($verboseLevel >= 2) {
+            vlog(0, "reading config-file $f...");
+        }
+        my $configObject = Config::General->new(
+            -AutoTrue       => 1, 
+            -ConfigFile     => $f, 
+            -LowerCaseNames => 1,
+            -SplitPolicy    => 'equalsign',
+        );
+        my %config = $configObject->getall();
+        foreach my $key (keys %config) {
+            # N.B.: these config files are used by shell-scripts, too, so in
+            # order to comply with shell-style, the config files use shell
+            # syntax and an uppercase, underline-as-separator format.
+            # Internally, we use lowercase, minus-as-separator format, so we
+            # need to convert the environment variable names to our own
+            # internal style here (e.g. 'SLX_BASE_PATH' to 'base-path'):
+            my $ourKey = $key;
+            $ourKey =~ s[^slx_][];
+            $ourKey =~ tr/_/-/;
+            $openslxConfig{$ourKey} = $config{$key};
+        }
+    }
+
+    # push any cmdline argument into our config hash, possibly overriding any
+    # setting from the config files:
+    while (my ($key, $val) = each(%cmdlineConfig)) {
+        next unless defined $val;
+        $openslxConfig{$key} = $val;
+    }
+
+    if (defined $openslxConfig{'logfile'}) {
+        open($openslxLog, '>>', $openslxConfig{'logfile'})
+          or croak(
+            _tr(
+                "unable to append to logfile '%s'! (%s)",    
+                $openslxConfig{'logfile'}, $!
+            )
+          );
+    }
+    if ($openslxConfig{'verbose-level'} >= 2) {
+        foreach my $key (sort keys %openslxConfig) {
+            my $val = $openslxConfig{$key} || '';
+            vlog(2, "config-dump: $key = $val");
+        }
+    }
+
+    # setup translation "engine":
+    trInit();
+
+    return 1;
 }
 
 # ------------------------------------------------------------------------------
 sub trInit
 {
-	# activate automatic charset conversion on all the standard I/O streams,
-	# just to give *some* support to shells in other charsets:
-	binmode(STDIN,  ":encoding($openslxConfig{'locale-charmap'})");
-	binmode(STDOUT, ":encoding($openslxConfig{'locale-charmap'})");
-	binmode(STDERR, ":encoding($openslxConfig{'locale-charmap'})");
-
-	my $locale = $openslxConfig{'locale'};
-	if (lc($locale) eq 'c') {
-		# treat locale 'c' as equivalent for 'posix':
-		$locale = 'posix';
-	}
-
-	if (lc($locale) ne 'posix') {
-		# parse locale and canonicalize it (e.g. to 'de_DE') and generate
-		# two filenames from it (language+country and language only):
-		if ($locale !~ m{^\s*([^_]+)(?:_(\w+))?}) {
-			die "locale $locale has unknown format!?!";
-		}
-		my @locales;
-		if (defined $2) {
-			push @locales, lc($1) . '_' . uc($2);
-		}
-		push @locales, lc($1);
-
-		# try to load any of the Translation modules (starting with the more
-		# specific one [language+country]):
-		my $loadedTranslationModule;
-		foreach my $trName (@locales) {
-			vlog(2,	"trying to load translation module $trName...");
-			my $trModule = "OpenSLX/Translations/$trName.pm";
-			my $trModuleSpec = "OpenSLX::Translations::$trName";
-			if (eval { require $trModule } ) {
-				# copy the translations available in the given locale into our 
-				# hash:
-				$translations = $trModuleSpec->getAllTranslations();
-				$loadedTranslationModule = $trModule;
-				vlog(
-					1,
-					_tr(
-						"translations module %s loaded successfully", $trModule
-					)
-				);
-				last;
-			}
-		}
-		if (!defined $loadedTranslationModule) {
-			vlog(1,
-				"unable to load any translations module for locale '$locale' ($!)."
-			);
-		}
-	}
-	return;
+    # activate automatic charset conversion on all the standard I/O streams,
+    # just to give *some* support to shells in other charsets:
+    binmode(STDIN,  ":encoding($openslxConfig{'locale-charmap'})");
+    binmode(STDOUT, ":encoding($openslxConfig{'locale-charmap'})");
+    binmode(STDERR, ":encoding($openslxConfig{'locale-charmap'})");
+
+    my $locale = $openslxConfig{'locale'};
+    if (lc($locale) eq 'c') {
+        # treat locale 'c' as equivalent for 'posix':
+        $locale = 'posix';
+    }
+
+    if (lc($locale) ne 'posix') {
+        # parse locale and canonicalize it (e.g. to 'de_DE') and generate
+        # two filenames from it (language+country and language only):
+        if ($locale !~ m{^\s*([^_]+)(?:_(\w+))?}) {
+            die "locale $locale has unknown format!?!";
+        }
+        my @locales;
+        if (defined $2) {
+            push @locales, lc($1) . '_' . uc($2);
+        }
+        push @locales, lc($1);
+
+        # try to load any of the Translation modules (starting with the more
+        # specific one [language+country]):
+        my $loadedTranslationModule;
+        foreach my $trName (@locales) {
+            vlog(2,    "trying to load translation module $trName...");
+            my $trModule = "OpenSLX/Translations/$trName.pm";
+            my $trModuleSpec = "OpenSLX::Translations::$trName";
+            if (eval { require $trModule } ) {
+                # copy the translations available in the given locale into our 
+                # hash:
+                $translations = $trModuleSpec->getAllTranslations();
+                $loadedTranslationModule = $trModule;
+                vlog(
+                    1,
+                    _tr(
+                        "translations module %s loaded successfully", $trModule
+                    )
+                );
+                last;
+            }
+        }
+        if (!defined $loadedTranslationModule) {
+            vlog(1,
+                "unable to load any translations module for locale '$locale' ($!)."
+            );
+        }
+    }
+    return;
 }
 
 # ------------------------------------------------------------------------------
 sub _tr
 {
-	my $trOrig = shift;
-
-	my $trKey = $trOrig;
-	$trKey =~ s[\n][\\n]g;
-	$trKey =~ s[\t][\\t]g;
-
-	my $formatStr;
-	if (defined $translations) {
-		$formatStr = $translations->{$trKey};
-	}
-	if (!defined $formatStr) {
-		$formatStr = $trOrig;
-	}
-	return sprintf($formatStr, @_);
+    my $trOrig = shift;
+
+    my $trKey = $trOrig;
+    $trKey =~ s[\n][\\n]g;
+    $trKey =~ s[\t][\\t]g;
+
+    my $formatStr;
+    if (defined $translations) {
+        $formatStr = $translations->{$trKey};
+    }
+    if (!defined $formatStr) {
+        $formatStr = $trOrig;
+    }
+    return sprintf($formatStr, @_);
 }
 
 # ------------------------------------------------------------------------------
 sub callInSubprocess
 {
-	my $childFunc = shift;
-
-	my $pid = fork();
-	if (!$pid) {
-
-		# child...
-		# ...execute the given function and exit:
-		my $ok = eval { $childFunc->(); 1 };
-		if (!$ok) {
-			print STDERR "*** $@";
-			exit 5;
-		}
-		exit 0;
-	}
-
-	# parent...
-	# ...pass on interrupt- and terminate-signals to child...
-	local $SIG{INT}  = sub { kill 'INT',  $pid; waitpid($pid, 0); exit $? };
-	local $SIG{TERM} = sub { kill 'TERM', $pid; waitpid($pid, 0); exit $? };
-
-	# ...and wait for child to do its work:
-	waitpid($pid, 0);
-	if ($?) {
-		exit $?;
-	}
-	return;
+    my $childFunc = shift;
+
+    my $pid = fork();
+    if (!$pid) {
+
+        # child...
+        # ...execute the given function and exit:
+        my $ok = eval { $childFunc->(); 1 };
+        if (!$ok) {
+            print STDERR "*** $@";
+            exit 5;
+        }
+        exit 0;
+    }
+
+    # parent...
+    # ...pass on interrupt- and terminate-signals to child...
+    local $SIG{INT}  = sub { kill 'INT',  $pid; waitpid($pid, 0); exit $? };
+    local $SIG{TERM} = sub { kill 'TERM', $pid; waitpid($pid, 0); exit $? };
+
+    # ...and wait for child to do its work:
+    waitpid($pid, 0);
+    if ($?) {
+        exit $?;
+    }
+    return;
 }
 
 # ------------------------------------------------------------------------------
 sub executeInSubprocess
 {
-	my @cmdlineArgs = @_;
+    my @cmdlineArgs = @_;
 
-	my $pid = fork();
-	if (!$pid) {
+    my $pid = fork();
+    if (!$pid) {
 
-		# child...
-		# ...exec the given cmdline:
-		exec(@cmdlineArgs);
-	}
+        # child...
+        # ...exec the given cmdline:
+        exec(@cmdlineArgs);
+    }
 
-	# parent...
-	return $pid;
+    # parent...
+    return $pid;
 }
 
 # ------------------------------------------------------------------------------
 sub addCleanupFunction
 {
-	my $name = shift;
-	my $func = shift;
+    my $name = shift;
+    my $func = shift;
 
-	$cleanupFunctions{$name} = $func;
-	return;
+    $cleanupFunctions{$name} = $func;
+    return;
 }
 
 # ------------------------------------------------------------------------------
 sub removeCleanupFunction
 {
-	my $name = shift;
+    my $name = shift;
 
-	delete $cleanupFunctions{$name};
-	return;
+    delete $cleanupFunctions{$name};
+    return;
 }
 
 # ------------------------------------------------------------------------------
 sub invokeCleanupFunctions
 {
-	my @funcNames = keys %cleanupFunctions;
-	foreach my $name (@funcNames) {
-		vlog(2, "invoking cleanup function '$name'...");
-		$cleanupFunctions{$name}->();
-	}
-	return;
+    my @funcNames = keys %cleanupFunctions;
+    foreach my $name (@funcNames) {
+        vlog(2, "invoking cleanup function '$name'...");
+        $cleanupFunctions{$name}->();
+    }
+    return;
 }
 
 # ------------------------------------------------------------------------------
 sub slxsystem
 {
-	vlog(2, _tr("executing: %s", join ' ', @_));
-	my $res = system(@_);
-	if ($res > 0) {
-		# check if child got killed, if so we stop, too (unless the signal is
-		# SIGPIPE, which we ignore in order to loop over failed FTP connections
-		# and the like):
-		my $signalNo = $res & 127;
-		if ($signalNo > 0 && $signalNo != 13) {
-			die _tr("child-process reveived signal '%s', parent stops!",
-				$signalNo);
-		}
-	}
-	return $res;
+    vlog(2, _tr("executing: %s", join ' ', @_));
+    my $res = system(@_);
+    if ($res > 0) {
+        # check if child got killed, if so we stop, too (unless the signal is
+        # SIGPIPE, which we ignore in order to loop over failed FTP connections
+        # and the like):
+        my $signalNo = $res & 127;
+        if ($signalNo > 0 && $signalNo != 13) {
+            die _tr("child-process reveived signal '%s', parent stops!",
+                $signalNo);
+        }
+    }
+    return $res;
 }
 
 # ------------------------------------------------------------------------------
 sub cluck
 {
-	_doThrowOrWarn('cluck', @_);
-	return;
+    _doThrowOrWarn('cluck', @_);
+    return;
 }
 
 # ------------------------------------------------------------------------------
 sub carp
 {
-	_doThrowOrWarn('carp', @_);
-	return;
+    _doThrowOrWarn('carp', @_);
+    return;
 }
 
 # ------------------------------------------------------------------------------
 sub warn
 {
-	_doThrowOrWarn('warn', @_);
-	return;
+    _doThrowOrWarn('warn', @_);
+    return;
 }
 
 # ------------------------------------------------------------------------------
 sub confess
 {
-	invokeCleanupFunctions();
-	_doThrowOrWarn('confess', @_);
-	return;
+    invokeCleanupFunctions();
+    _doThrowOrWarn('confess', @_);
+    return;
 }
 
 # ------------------------------------------------------------------------------
 sub croak
 {
-	invokeCleanupFunctions();
-	_doThrowOrWarn('croak', @_);
-	return;
+    invokeCleanupFunctions();
+    _doThrowOrWarn('croak', @_);
+    return;
 }
 
 # ------------------------------------------------------------------------------
 sub die
 {
-	invokeCleanupFunctions();
-	_doThrowOrWarn('die', @_);
-	return;
+    invokeCleanupFunctions();
+    _doThrowOrWarn('die', @_);
+    return;
 }
 
 # ------------------------------------------------------------------------------
 sub _doThrowOrWarn
 {
-	my $type = shift;
-	my $msg = shift;
-	
-	# use '°°°' for warnings and '***' for errors
-	if ($type eq 'carp' || $type eq 'warn' || $type eq 'cluck') {
-		$msg =~ s[^°°° ][]igms;
-		$msg =~ s[^][°°° ]igms;
-	}
-	else {
-		$msg =~ s[^\*\*\* ][]igms;
-		$msg =~ s[^][*** ]igms;
-	}
-
-	if ($openslxConfig{'debug-confess'}) {
-		my %functionFor = (
-			'carp' => sub { Carp::cluck @_ },
-			'cluck' => sub { Carp::cluck @_ },
-			'confess' => sub { Carp::confess @_ },
-			'croak' => sub { Carp::confess @_ },
-			'die' => sub { Carp::confess @_ },
-			'warn' => sub { Carp::cluck @_ },
-		);
-		my $func = $functionFor{$type};
-		$func->($msg);
-	}
-	else {
-		chomp $msg;
-		my %functionFor = (
-			'carp' => sub { Carp::carp @_ },
-			'cluck' => sub { Carp::cluck @_ },
-			'confess' => sub { Carp::confess @_ },
-			'croak' => sub { Carp::croak @_ },
-			'die' => sub { CORE::die @_},
-			'warn' => sub { CORE::warn @_ },
-		);
-		my $func = $functionFor{$type};
-		$func->("$msg\n");
-	}
-	return;
+    my $type = shift;
+    my $msg = shift;
+    
+    # use '°°°' for warnings and '***' for errors
+    if ($type eq 'carp' || $type eq 'warn' || $type eq 'cluck') {
+        $msg =~ s[^°°° ][]igms;
+        $msg =~ s[^][°°° ]igms;
+    }
+    else {
+        $msg =~ s[^\*\*\* ][]igms;
+        $msg =~ s[^][*** ]igms;
+    }
+
+    if ($openslxConfig{'debug-confess'}) {
+        my %functionFor = (
+            'carp' => sub { Carp::cluck @_ },
+            'cluck' => sub { Carp::cluck @_ },
+            'confess' => sub { Carp::confess @_ },
+            'croak' => sub { Carp::confess @_ },
+            'die' => sub { Carp::confess @_ },
+            'warn' => sub { Carp::cluck @_ },
+        );
+        my $func = $functionFor{$type};
+        $func->($msg);
+    }
+    else {
+        chomp $msg;
+        my %functionFor = (
+            'carp' => sub { Carp::carp @_ },
+            'cluck' => sub { Carp::cluck @_ },
+            'confess' => sub { Carp::confess @_ },
+            'croak' => sub { Carp::croak @_ },
+            'die' => sub { CORE::die @_},
+            'warn' => sub { CORE::warn @_ },
+        );
+        my $func = $functionFor{$type};
+        $func->("$msg\n");
+    }
+    return;
 }
 
 =item checkParams()
@@ -598,36 +598,36 @@ sub checkParams
 # ------------------------------------------------------------------------------
 sub instantiateClass
 {
-	my $class = shift;
-	my $flags = shift || {};
-
-	checkParams($flags, { 
-		'pathToClass' => '?', 
-		'version'     => '?' 
-	});
-	my $pathToClass      = $flags->{pathToClass};
-	my $requestedVersion = $flags->{version};
-
-	my $moduleName = defined $pathToClass ? "$pathToClass/$class" : $class;
-	$moduleName =~ s[::][/]g;
-	$moduleName .= '.pm';
-	unless (eval { require $moduleName } ) {
-		if ($! == 2) {
-			die _tr("Module '%s' not found!\n", $moduleName);
-		}
-		else {
-			die _tr("Unable to load module '%s' (%s)\n", $moduleName, $@);
-		}
-	}
-	if (defined $requestedVersion) {
-		my $classVersion = $class->VERSION;
-		if ($classVersion < $requestedVersion) {
-			die _tr(
-				'Could not load class <%s> (Version <%s> required, but <%s> found)',
-				$class, $requestedVersion, $classVersion);
-		}
-	}
-	return $class->new;
+    my $class = shift;
+    my $flags = shift || {};
+
+    checkParams($flags, { 
+        'pathToClass' => '?', 
+        'version'     => '?' 
+    });
+    my $pathToClass      = $flags->{pathToClass};
+    my $requestedVersion = $flags->{version};
+
+    my $moduleName = defined $pathToClass ? "$pathToClass/$class" : $class;
+    $moduleName =~ s[::][/]g;
+    $moduleName .= '.pm';
+    unless (eval { require $moduleName } ) {
+        if ($! == 2) {
+            die _tr("Module '%s' not found!\n", $moduleName);
+        }
+        else {
+            die _tr("Unable to load module '%s' (%s)\n", $moduleName, $@);
+        }
+    }
+    if (defined $requestedVersion) {
+        my $classVersion = $class->VERSION;
+        if ($classVersion < $requestedVersion) {
+            die _tr(
+                'Could not load class <%s> (Version <%s> required, but <%s> found)',
+                $class, $requestedVersion, $classVersion);
+        }
+    }
+    return $class->new;
 }
 
 1;
diff --git a/lib/OpenSLX/ConfigFolder.pm b/lib/OpenSLX/ConfigFolder.pm
index 99289881..e8c3ee8f 100644
--- a/lib/OpenSLX/ConfigFolder.pm
+++ b/lib/OpenSLX/ConfigFolder.pm
@@ -9,7 +9,7 @@
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
 # ConfigFolder.pm
-#	- provides utility functions for generation of configuration folders
+#    - provides utility functions for generation of configuration folders
 # -----------------------------------------------------------------------------
 package OpenSLX::ConfigFolder;
 
@@ -23,8 +23,8 @@ $VERSION = 1.01;
 @ISA = qw(Exporter);
 
 @EXPORT = qw(
-	&createConfigFolderForDefaultSystem
-	&createConfigFolderForSystem
+    &createConfigFolderForDefaultSystem
+    &createConfigFolderForSystem
 );
 
 ################################################################################
@@ -35,68 +35,68 @@ use OpenSLX::Utils;
 
 sub createConfigFolderForDefaultSystem
 {
-	my $result = 0;
-	my $defaultConfigPath = "$openslxConfig{'private-path'}/config/default";
-	if (!-e "$defaultConfigPath/initramfs") {
-		slxsystem("mkdir -p $defaultConfigPath/initramfs");
-		$result = 1;
-	}
-	if (!-e "$defaultConfigPath/rootfs") {
-		slxsystem("mkdir -p $defaultConfigPath/rootfs");
-		$result = 1;
-	}
+    my $result = 0;
+    my $defaultConfigPath = "$openslxConfig{'private-path'}/config/default";
+    if (!-e "$defaultConfigPath/initramfs") {
+        slxsystem("mkdir -p $defaultConfigPath/initramfs");
+        $result = 1;
+    }
+    if (!-e "$defaultConfigPath/rootfs") {
+        slxsystem("mkdir -p $defaultConfigPath/rootfs");
+        $result = 1;
+    }
 
-	# create default pre-/postinit scripts for us in initramfs:
-	my $preInitFile = "$defaultConfigPath/initramfs/preinit.local";
-	if (!-e $preInitFile) {
-		my $preInit = unshiftHereDoc(<<'			END-of-HERE');
-			#!/bin/sh
-			#
-			# This script allows the local admin to extend the
-			# capabilities at the beginning of the initramfs (stage3).
-			# The toolset is rather limited and you have to keep in mind 
-			# that stage4 rootfs has the prefix '/mnt'.
-			END-of-HERE
-		spitFile($preInitFile, $preInit);
-		slxsystem("chmod u+x $preInitFile");
-		$result = 1;
-	}
+    # create default pre-/postinit scripts for us in initramfs:
+    my $preInitFile = "$defaultConfigPath/initramfs/preinit.local";
+    if (!-e $preInitFile) {
+        my $preInit = unshiftHereDoc(<<'            END-of-HERE');
+            #!/bin/sh
+            #
+            # This script allows the local admin to extend the
+            # capabilities at the beginning of the initramfs (stage3).
+            # The toolset is rather limited and you have to keep in mind 
+            # that stage4 rootfs has the prefix '/mnt'.
+            END-of-HERE
+        spitFile($preInitFile, $preInit);
+        slxsystem("chmod u+x $preInitFile");
+        $result = 1;
+    }
 
-	my $postInitFile = "$defaultConfigPath/initramfs/postinit.local";
-	if (!-e $postInitFile) {
-		my $postInit = unshiftHereDoc(<<'			END-of-HERE');
-			#!/bin/sh
-			#
-			# This script allows the local admin to extend the
-			# capabilities at the end of the initramfs (stage3).
-			# The toolset is rather limited and you have to keep in mind 
-			# that stage4 rootfs has the prefix '/mnt'.
-			# But you may use some special slx-functions available via
-			# inclusion: '. /etc/functions' ...
-			END-of-HERE
-		spitFile($postInitFile, $postInit);
-		slxsystem("chmod u+x $postInitFile");
-		$result = 1;
-	}
-	return $result;
+    my $postInitFile = "$defaultConfigPath/initramfs/postinit.local";
+    if (!-e $postInitFile) {
+        my $postInit = unshiftHereDoc(<<'            END-of-HERE');
+            #!/bin/sh
+            #
+            # This script allows the local admin to extend the
+            # capabilities at the end of the initramfs (stage3).
+            # The toolset is rather limited and you have to keep in mind 
+            # that stage4 rootfs has the prefix '/mnt'.
+            # But you may use some special slx-functions available via
+            # inclusion: '. /etc/functions' ...
+            END-of-HERE
+        spitFile($postInitFile, $postInit);
+        slxsystem("chmod u+x $postInitFile");
+        $result = 1;
+    }
+    return $result;
 }
 
 sub createConfigFolderForSystem
 {
-	my $systemName = shift || confess "need to pass in system-name!";
+    my $systemName = shift || confess "need to pass in system-name!";
 
-	my $result = 0;
-	my $systemConfigPath 
-		= "$openslxConfig{'private-path'}/config/$systemName/default";
-	if (!-e "$systemConfigPath/initramfs") {
-		slxsystem("mkdir -p $systemConfigPath/initramfs");
-		$result = 1;
-	}
-	if (!-e "$systemConfigPath/rootfs") {
-		slxsystem("mkdir -p $systemConfigPath/rootfs");
-		$result = 1;
-	}
-	return $result;
+    my $result = 0;
+    my $systemConfigPath 
+        = "$openslxConfig{'private-path'}/config/$systemName/default";
+    if (!-e "$systemConfigPath/initramfs") {
+        slxsystem("mkdir -p $systemConfigPath/initramfs");
+        $result = 1;
+    }
+    if (!-e "$systemConfigPath/rootfs") {
+        slxsystem("mkdir -p $systemConfigPath/rootfs");
+        $result = 1;
+    }
+    return $result;
 }
 
 1;
diff --git a/lib/OpenSLX/Translations/de.pm b/lib/OpenSLX/Translations/de.pm
index e98edd03..b0783b81 100644
--- a/lib/OpenSLX/Translations/de.pm
+++ b/lib/OpenSLX/Translations/de.pm
@@ -9,7 +9,7 @@
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
 # de.pm
-#	- OpenSLX-translations for the German language.
+#    - OpenSLX-translations for the German language.
 # -----------------------------------------------------------------------------
 package OpenSLX::Translations::de;
 
@@ -25,8 +25,8 @@ my %translations;
 ################################################################################
 sub getAllTranslations
 {
-	my $class = shift;
-	return \%translations;
+    my $class = shift;
+    return \%translations;
 }
 
 ################################################################################
@@ -34,325 +34,325 @@ sub getAllTranslations
 ################################################################################
 
 %translations = (
-	q{NEW:%s doesn't seem to be installed,\nso there is no support for %s available, sorry!\n}
-	=>
-	qq{},
+    q{NEW:%s doesn't seem to be installed,\nso there is no support for %s available, sorry!\n}
+    =>
+    qq{},
 
-	q{NEW:%s has wrong bitwidth (%s instead of %s)}
-	=>
-	qq{},
+    q{NEW:%s has wrong bitwidth (%s instead of %s)}
+    =>
+    qq{},
 
-	q{NEW:%s: ignored, as it isn't an executable or a shared library\n}
-	=>
-	qq{},
+    q{NEW:%s: ignored, as it isn't an executable or a shared library\n}
+    =>
+    qq{},
 
-	q{NEW:'%s' already exists!\n}
-	=>
-	qq{},
+    q{NEW:'%s' already exists!\n}
+    =>
+    qq{},
 
-	q{NEW:'%s' not found, maybe wrong root-path?\n}
-	=>
-	qq{},
+    q{NEW:'%s' not found, maybe wrong root-path?\n}
+    =>
+    qq{},
 
-	q{NEW:\trpath='%s'\n}
-	=>
-	qq{},
+    q{NEW:\trpath='%s'\n}
+    =>
+    qq{},
 
-	q{NEW:\ttrying objdump...\n}
-	=>
-	qq{},
+    q{NEW:\ttrying objdump...\n}
+    =>
+    qq{},
 
-	q{NEW:\ttrying readelf...\n}
-	=>
-	qq{},
+    q{NEW:\ttrying readelf...\n}
+    =>
+    qq{},
 
-	q{NEW:analyzing '%s'...\n}
-	=>
-	qq{},
+    q{NEW:analyzing '%s'...\n}
+    =>
+    qq{},
 
-	q{NEW:Can't add column to table <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't add column to table <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't add columns to table <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't add columns to table <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't change columns in table <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't change columns in table <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't create table <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't create table <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't delete from table <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't delete from table <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't drop columns from table <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't drop columns from table <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't drop table <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't drop table <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't execute SQL-statement <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't execute SQL-statement <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't insert into table <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't insert into table <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't lock ID-file <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't lock ID-file <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't open ID-file <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't open ID-file <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't prepare SQL-statement <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't prepare SQL-statement <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't rename table <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't rename table <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't to seek ID-file <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't to seek ID-file <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't truncate ID-file <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't truncate ID-file <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't update ID-file <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't update ID-file <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Can't update table <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Can't update table <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:Cannot connect to database <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Cannot connect to database <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:config-file <%s> has incorrect syntax here:\n\t%s\n}
-	=>
-	qq{},
+    q{NEW:config-file <%s> has incorrect syntax here:\n\t%s\n}
+    =>
+    qq{},
 
-	q{NEW:copying kernel %s to %s/kernel}
-	=>
-	qq{},
+    q{NEW:copying kernel %s to %s/kernel}
+    =>
+    qq{},
 
-	q{Could not determine schema version of database}
-	=>
-	qq{Die Version des Datenbank-Schemas konnte nicht bestimmt werden},
+    q{Could not determine schema version of database}
+    =>
+    qq{Die Version des Datenbank-Schemas konnte nicht bestimmt werden},
 
-	q{NEW:Could not load module <%s> (Version <%s> required, but <%s> found)}
-	=>
-	qq{},
+    q{NEW:Could not load module <%s> (Version <%s> required, but <%s> found)}
+    =>
+    qq{},
 
-	q{NEW:creating tar %s}
-	=>
-	qq{},
+    q{NEW:creating tar %s}
+    =>
+    qq{},
 
-	q{NEW:DB matches current schema version %s}
-	=>
-	qq{},
+    q{NEW:DB matches current schema version %s}
+    =>
+    qq{},
 
-	q{NEW:executing %s}
-	=>
-	qq{},
+    q{NEW:executing %s}
+    =>
+    qq{},
 
-	q{NEW:exporting client %d:%s}
-	=>
-	qq{},
+    q{NEW:exporting client %d:%s}
+    =>
+    qq{},
 
-	q{NEW:exporting system %d:%s}
-	=>
-	qq{},
+    q{NEW:exporting system %d:%s}
+    =>
+    qq{},
 
-	q{NEW:generating initialramfs %s/initramfs}
-	=>
-	qq{},
+    q{NEW:generating initialramfs %s/initramfs}
+    =>
+    qq{},
 
-	q{NEW:ignoring unknown key <%s>}
-	=>
-	qq{},
+    q{NEW:ignoring unknown key <%s>}
+    =>
+    qq{},
 
-	q{NEW:List of supported systems:\n\t}
-	=>
-	qq{},
+    q{NEW:List of supported systems:\n\t}
+    =>
+    qq{},
 
-	q{NEW:Lock-file <%s> exists, script is already running.\nPlease remove the logfile and try again if you are sure that no one else\nis executing this script.\n}
-	=>
-	qq{},
+    q{NEW:Lock-file <%s> exists, script is already running.\nPlease remove the logfile and try again if you are sure that no one else\nis executing this script.\n}
+    =>
+    qq{},
 
-	q{NEW:merging %s (val=%s)}
-	=>
-	qq{},
+    q{NEW:merging %s (val=%s)}
+    =>
+    qq{},
 
-	q{NEW:merging from default client...}
-	=>
-	qq{},
+    q{NEW:merging from default client...}
+    =>
+    qq{},
 
-	q{NEW:merging from group %d:%s...}
-	=>
-	qq{},
+    q{NEW:merging from group %d:%s...}
+    =>
+    qq{},
 
-	q{NEW:neither objdump nor readelf seems to be installed, giving up!\n}
-	=>
-	qq{},
+    q{NEW:neither objdump nor readelf seems to be installed, giving up!\n}
+    =>
+    qq{},
 
-	q{no}
-	=>
-	qq{nein},
+    q{no}
+    =>
+    qq{nein},
 
-	q{NEW:Our schema-version is %s, DB is %s, upgrading DB...}
-	=>
-	qq{},
+    q{NEW:Our schema-version is %s, DB is %s, upgrading DB...}
+    =>
+    qq{},
 
-	q{NEW:PXE-system %s already exists!}
-	=>
-	qq{},
+    q{NEW:PXE-system %s already exists!}
+    =>
+    qq{},
 
-	q{NEW:removing %s}
-	=>
-	qq{},
+    q{NEW:removing %s}
+    =>
+    qq{},
 
-	q{NEW:setting %s to <%s>}
-	=>
-	qq{},
+    q{NEW:setting %s to <%s>}
+    =>
+    qq{},
 
-	q{NEW:slxldd: unable to find file '%s', skipping it\n}
-	=>
-	qq{},
+    q{NEW:slxldd: unable to find file '%s', skipping it\n}
+    =>
+    qq{},
 
-	q{NEW:Sorry, system '%s' is unsupported.\n}
-	=>
-	qq{},
+    q{NEW:Sorry, system '%s' is unsupported.\n}
+    =>
+    qq{},
 
-	q{NEW:system-error: illegal target-path <%s>!}
-	=>
-	qq{},
+    q{NEW:system-error: illegal target-path <%s>!}
+    =>
+    qq{},
 
-	q{This will overwrite the current OpenSLX-database with an example dataset.\nAll your data (%s systems and %s clients) will be lost!\nDo you want to continue(%s/%s)? }
-	=>
-	qq{Die aktuelle OpenSLX-Datenbank wird mit einem Beispiel-Datensatz überschrieben.\nAlle Daten (%s Systeme und %s Clients) werden gelöscht!\nMöchten Sie den Vorgang fortsetzen(%s/%s)? },
+    q{This will overwrite the current OpenSLX-database with an example dataset.\nAll your data (%s systems and %s clients) will be lost!\nDo you want to continue(%s/%s)? }
+    =>
+    qq{Die aktuelle OpenSLX-Datenbank wird mit einem Beispiel-Datensatz überschrieben.\nAlle Daten (%s Systeme und %s Clients) werden gelöscht!\nMöchten Sie den Vorgang fortsetzen(%s/%s)? },
 
-	q{NEW:translations module %s loaded successfully}
-	=>
-	qq{},
+    q{NEW:translations module %s loaded successfully}
+    =>
+    qq{},
 
-	q{NEW:Unable to access client-config-path '%s'!}
-	=>
-	qq{},
+    q{NEW:Unable to access client-config-path '%s'!}
+    =>
+    qq{},
 
-	q{NEW:unable to create db-datadir %s! (%s)\n}
-	=>
-	qq{},
+    q{NEW:unable to create db-datadir %s! (%s)\n}
+    =>
+    qq{},
 
-	q{NEW:Unable to create lock-file <%s>, exiting!\n}
-	=>
-	qq{},
+    q{NEW:Unable to create lock-file <%s>, exiting!\n}
+    =>
+    qq{},
 
-	q{NEW:Unable to create or access temp-path '%s'!}
-	=>
-	qq{},
+    q{NEW:Unable to create or access temp-path '%s'!}
+    =>
+    qq{},
 
-	q{NEW:Unable to create or access tftpboot-path '%s'!}
-	=>
-	qq{},
+    q{NEW:Unable to create or access tftpboot-path '%s'!}
+    =>
+    qq{},
 
-	q{NEW:unable to execute shell-command:\n\t%s \n\t(%s)}
-	=>
-	qq{},
+    q{NEW:unable to execute shell-command:\n\t%s \n\t(%s)}
+    =>
+    qq{},
 
-	q{NEW:unable to fetch file info for '%s', giving up!\n}
-	=>
-	qq{},
+    q{NEW:unable to fetch file info for '%s', giving up!\n}
+    =>
+    qq{},
 
-	q{NEW:Unable to load DB-module <%s> (%s)\n}
-	=>
-	qq{},
+    q{NEW:Unable to load DB-module <%s> (%s)\n}
+    =>
+    qq{},
 
-	q{NEW:Unable to load DB-module <%s>\nthat database type is not supported (yet?)\n}
-	=>
-	qq{},
+    q{NEW:Unable to load DB-module <%s>\nthat database type is not supported (yet?)\n}
+    =>
+    qq{},
 
-	q{NEW:unable to load DHCP-Export backend '%s'! (%s)\n}
-	=>
-	qq{},
+    q{NEW:unable to load DHCP-Export backend '%s'! (%s)\n}
+    =>
+    qq{},
 
-	q{NEW:Unable to load module <%s> (Version <%s> required)}
-	=>
-	qq{},
+    q{NEW:Unable to load module <%s> (Version <%s> required)}
+    =>
+    qq{},
 
-	q{NEW:Unable to load module <%s> (Version <%s> required, but <%s> found)}
-	=>
-	qq{},
+    q{NEW:Unable to load module <%s> (Version <%s> required, but <%s> found)}
+    =>
+    qq{},
 
-	q{NEW:Unable to load system-module <%s> (%s)\n}
-	=>
-	qq{},
+    q{NEW:Unable to load system-module <%s> (%s)\n}
+    =>
+    qq{},
 
-	q{NEW:Unable to load system-module <%s>!\n}
-	=>
-	qq{},
+    q{NEW:Unable to load system-module <%s>!\n}
+    =>
+    qq{},
 
-	q{NEW:Unable to write local settings file <%s> (%s)}
-	=>
-	qq{},
+    q{NEW:Unable to write local settings file <%s> (%s)}
+    =>
+    qq{},
 
-	q{NEW:unknown settings key <%s>!\n}
-	=>
-	qq{},
+    q{NEW:unknown settings key <%s>!\n}
+    =>
+    qq{},
 
-	q{NEW:UnknownDbSchemaColumnDescr}
-	=>
-	qq{},
+    q{NEW:UnknownDbSchemaColumnDescr}
+    =>
+    qq{},
 
-	q{UnknownDbSchemaCommand}
-	=>
-	qq{Unbekannter DbSchema-Befehl <%s> wird übergangen},
+    q{UnknownDbSchemaCommand}
+    =>
+    qq{Unbekannter DbSchema-Befehl <%s> wird übergangen},
 
-	q{NEW:UnknownDbSchemaTypeDescr}
-	=>
-	qq{},
+    q{NEW:UnknownDbSchemaTypeDescr}
+    =>
+    qq{},
 
-	q{NEW:upgrade done}
-	=>
-	qq{},
+    q{NEW:upgrade done}
+    =>
+    qq{},
 
-	q{NEW:writing dhcp-config for %s clients}
-	=>
-	qq{},
+    q{NEW:writing dhcp-config for %s clients}
+    =>
+    qq{},
 
-	q{NEW:writing PXE-file %s}
-	=>
-	qq{},
+    q{NEW:writing PXE-file %s}
+    =>
+    qq{},
 
-	q{yes}
-	=>
-	qq{ja},
+    q{yes}
+    =>
+    qq{ja},
 
-	q{NEW:You need to specify at least one file!\n}
-	=>
-	qq{},
+    q{NEW:You need to specify at least one file!\n}
+    =>
+    qq{},
 
-	q{NEW:You need to specify exactly one system name!\n}
-	=>
-	qq{},
+    q{NEW:You need to specify exactly one system name!\n}
+    =>
+    qq{},
 
-	q{NEW:You need to specify the root-path!\n}
-	=>
-	qq{},
+    q{NEW:You need to specify the root-path!\n}
+    =>
+    qq{},
 
 );
 
diff --git a/lib/OpenSLX/Translations/posix.pm b/lib/OpenSLX/Translations/posix.pm
index 05e16ed5..61a94c93 100644
--- a/lib/OpenSLX/Translations/posix.pm
+++ b/lib/OpenSLX/Translations/posix.pm
@@ -9,7 +9,7 @@
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
 # posix.pm
-#	- OpenSLX-translations for the posix locale (English language).
+#    - OpenSLX-translations for the posix locale (English language).
 # -----------------------------------------------------------------------------
 package OpenSLX::Translations::posix;
 
@@ -25,8 +25,8 @@ my %translations;
 ################################################################################
 sub getAllTranslations
 {
-	my $class = shift;
-	return \%translations;
+    my $class = shift;
+    return \%translations;
 }
 
 ################################################################################
@@ -34,325 +34,325 @@ sub getAllTranslations
 ################################################################################
 
 %translations = (
-	q{%s doesn't seem to be installed,\nso there is no support for %s available, sorry!\n}
-	=>
-	qq{%s doesn't seem to be installed,\nso there is no support for %s available, sorry!\n},
+    q{%s doesn't seem to be installed,\nso there is no support for %s available, sorry!\n}
+    =>
+    qq{%s doesn't seem to be installed,\nso there is no support for %s available, sorry!\n},
 
-	q{%s has wrong bitwidth (%s instead of %s)}
-	=>
-	qq{%s has wrong bitwidth (%s instead of %s)},
+    q{%s has wrong bitwidth (%s instead of %s)}
+    =>
+    qq{%s has wrong bitwidth (%s instead of %s)},
 
-	q{%s: ignored, as it isn't an executable or a shared library\n}
-	=>
-	qq{%s: ignored, as it isn't an executable or a shared library\n},
+    q{%s: ignored, as it isn't an executable or a shared library\n}
+    =>
+    qq{%s: ignored, as it isn't an executable or a shared library\n},
 
-	q{'%s' already exists!\n}
-	=>
-	qq{'%s' already exists!\n},
+    q{'%s' already exists!\n}
+    =>
+    qq{'%s' already exists!\n},
 
-	q{'%s' not found, maybe wrong root-path?\n}
-	=>
-	qq{'%s' not found, maybe wrong root-path?\n},
+    q{'%s' not found, maybe wrong root-path?\n}
+    =>
+    qq{'%s' not found, maybe wrong root-path?\n},
 
-	q{\trpath='%s'\n}
-	=>
-	qq{\trpath='%s'\n},
+    q{\trpath='%s'\n}
+    =>
+    qq{\trpath='%s'\n},
 
-	q{\ttrying objdump...\n}
-	=>
-	qq{\ttrying objdump...\n},
+    q{\ttrying objdump...\n}
+    =>
+    qq{\ttrying objdump...\n},
 
-	q{\ttrying readelf...\n}
-	=>
-	qq{\ttrying readelf...\n},
+    q{\ttrying readelf...\n}
+    =>
+    qq{\ttrying readelf...\n},
 
-	q{analyzing '%s'...\n}
-	=>
-	qq{analyzing '%s'...\n},
+    q{analyzing '%s'...\n}
+    =>
+    qq{analyzing '%s'...\n},
 
-	q{Can't add column to table <%s> (%s)}
-	=>
-	qq{Can't add column to table <%s> (%s)},
+    q{Can't add column to table <%s> (%s)}
+    =>
+    qq{Can't add column to table <%s> (%s)},
 
-	q{Can't add columns to table <%s> (%s)}
-	=>
-	qq{Can't add columns to table <%s> (%s)},
+    q{Can't add columns to table <%s> (%s)}
+    =>
+    qq{Can't add columns to table <%s> (%s)},
 
-	q{Can't change columns in table <%s> (%s)}
-	=>
-	qq{Can't change columns in table <%s> (%s)},
+    q{Can't change columns in table <%s> (%s)}
+    =>
+    qq{Can't change columns in table <%s> (%s)},
 
-	q{Can't create table <%s> (%s)}
-	=>
-	qq{Can't create table <%s> (%s)},
+    q{Can't create table <%s> (%s)}
+    =>
+    qq{Can't create table <%s> (%s)},
 
-	q{Can't delete from table <%s> (%s)}
-	=>
-	qq{Can't delete from table <%s> (%s)},
+    q{Can't delete from table <%s> (%s)}
+    =>
+    qq{Can't delete from table <%s> (%s)},
 
-	q{Can't drop columns from table <%s> (%s)}
-	=>
-	qq{Can't drop columns from table <%s> (%s)},
+    q{Can't drop columns from table <%s> (%s)}
+    =>
+    qq{Can't drop columns from table <%s> (%s)},
 
-	q{Can't drop table <%s> (%s)}
-	=>
-	qq{Can't drop table <%s> (%s)},
+    q{Can't drop table <%s> (%s)}
+    =>
+    qq{Can't drop table <%s> (%s)},
 
-	q{Can't execute SQL-statement <%s> (%s)}
-	=>
-	qq{Can't execute SQL-statement <%s> (%s)},
+    q{Can't execute SQL-statement <%s> (%s)}
+    =>
+    qq{Can't execute SQL-statement <%s> (%s)},
 
-	q{Can't insert into table <%s> (%s)}
-	=>
-	qq{Can't insert into table <%s> (%s)},
+    q{Can't insert into table <%s> (%s)}
+    =>
+    qq{Can't insert into table <%s> (%s)},
 
-	q{Can't lock ID-file <%s> (%s)}
-	=>
-	qq{Can't lock ID-file <%s> (%s)},
+    q{Can't lock ID-file <%s> (%s)}
+    =>
+    qq{Can't lock ID-file <%s> (%s)},
 
-	q{Can't open ID-file <%s> (%s)}
-	=>
-	qq{Can't open ID-file <%s> (%s)},
+    q{Can't open ID-file <%s> (%s)}
+    =>
+    qq{Can't open ID-file <%s> (%s)},
 
-	q{Can't prepare SQL-statement <%s> (%s)}
-	=>
-	qq{Can't prepare SQL-statement <%s> (%s)},
+    q{Can't prepare SQL-statement <%s> (%s)}
+    =>
+    qq{Can't prepare SQL-statement <%s> (%s)},
 
-	q{Can't rename table <%s> (%s)}
-	=>
-	qq{Can't rename table <%s> (%s)},
+    q{Can't rename table <%s> (%s)}
+    =>
+    qq{Can't rename table <%s> (%s)},
 
-	q{Can't to seek ID-file <%s> (%s)}
-	=>
-	qq{Can't to seek ID-file <%s> (%s)},
+    q{Can't to seek ID-file <%s> (%s)}
+    =>
+    qq{Can't to seek ID-file <%s> (%s)},
 
-	q{Can't truncate ID-file <%s> (%s)}
-	=>
-	qq{Can't truncate ID-file <%s> (%s)},
+    q{Can't truncate ID-file <%s> (%s)}
+    =>
+    qq{Can't truncate ID-file <%s> (%s)},
 
-	q{Can't update ID-file <%s> (%s)}
-	=>
-	qq{Can't update ID-file <%s> (%s)},
+    q{Can't update ID-file <%s> (%s)}
+    =>
+    qq{Can't update ID-file <%s> (%s)},
 
-	q{Can't update table <%s> (%s)}
-	=>
-	qq{Can't update table <%s> (%s)},
+    q{Can't update table <%s> (%s)}
+    =>
+    qq{Can't update table <%s> (%s)},
 
-	q{Cannot connect to database <%s> (%s)}
-	=>
-	qq{Cannot connect to database <%s> (%s)},
+    q{Cannot connect to database <%s> (%s)}
+    =>
+    qq{Cannot connect to database <%s> (%s)},
 
-	q{config-file <%s> has incorrect syntax here:\n\t%s\n}
-	=>
-	qq{config-file <%s> has incorrect syntax here:\n\t%s\n},
+    q{config-file <%s> has incorrect syntax here:\n\t%s\n}
+    =>
+    qq{config-file <%s> has incorrect syntax here:\n\t%s\n},
 
-	q{copying kernel %s to %s/kernel}
-	=>
-	qq{copying kernel %s to %s/kernel},
+    q{copying kernel %s to %s/kernel}
+    =>
+    qq{copying kernel %s to %s/kernel},
 
-	q{Could not determine schema version of database}
-	=>
-	qq{Could not determine schema version of database},
+    q{Could not determine schema version of database}
+    =>
+    qq{Could not determine schema version of database},
 
-	q{Could not load module <%s> (Version <%s> required, but <%s> found)}
-	=>
-	qq{Could not load module <%s> (Version <%s> required, but <%s> found)},
+    q{Could not load module <%s> (Version <%s> required, but <%s> found)}
+    =>
+    qq{Could not load module <%s> (Version <%s> required, but <%s> found)},
 
-	q{creating tar %s}
-	=>
-	qq{creating tar %s},
+    q{creating tar %s}
+    =>
+    qq{creating tar %s},
 
-	q{DB matches current schema version %s}
-	=>
-	qq{DB matches current schema version %s},
+    q{DB matches current schema version %s}
+    =>
+    qq{DB matches current schema version %s},
 
-	q{executing %s}
-	=>
-	qq{executing %s},
+    q{executing %s}
+    =>
+    qq{executing %s},
 
-	q{exporting client %d:%s}
-	=>
-	qq{exporting client %d:%s},
+    q{exporting client %d:%s}
+    =>
+    qq{exporting client %d:%s},
 
-	q{exporting system %d:%s}
-	=>
-	qq{exporting system %d:%s},
+    q{exporting system %d:%s}
+    =>
+    qq{exporting system %d:%s},
 
-	q{generating initialramfs %s/initramfs}
-	=>
-	qq{generating initialramfs %s/initramfs},
+    q{generating initialramfs %s/initramfs}
+    =>
+    qq{generating initialramfs %s/initramfs},
 
-	q{ignoring unknown key <%s>}
-	=>
-	qq{ignoring unknown key <%s>},
+    q{ignoring unknown key <%s>}
+    =>
+    qq{ignoring unknown key <%s>},
 
-	q{List of supported systems:\n\t}
-	=>
-	qq{List of supported systems:\n\t},
+    q{List of supported systems:\n\t}
+    =>
+    qq{List of supported systems:\n\t},
 
-	q{Lock-file <%s> exists, script is already running.\nPlease remove the logfile and try again if you are sure that no one else\nis executing this script.\n}
-	=>
-	qq{Lock-file <%s> exists, script is already running.\nPlease remove the logfile and try again if you are sure that no one else\nis executing this script.\n},
+    q{Lock-file <%s> exists, script is already running.\nPlease remove the logfile and try again if you are sure that no one else\nis executing this script.\n}
+    =>
+    qq{Lock-file <%s> exists, script is already running.\nPlease remove the logfile and try again if you are sure that no one else\nis executing this script.\n},
 
-	q{merging %s (val=%s)}
-	=>
-	qq{merging %s (val=%s)},
+    q{merging %s (val=%s)}
+    =>
+    qq{merging %s (val=%s)},
 
-	q{merging from default client...}
-	=>
-	qq{merging from default client...},
+    q{merging from default client...}
+    =>
+    qq{merging from default client...},
 
-	q{merging from group %d:%s...}
-	=>
-	qq{merging from group %d:%s...},
+    q{merging from group %d:%s...}
+    =>
+    qq{merging from group %d:%s...},
 
-	q{neither objdump nor readelf seems to be installed, giving up!\n}
-	=>
-	qq{neither objdump nor readelf seems to be installed, giving up!\n},
+    q{neither objdump nor readelf seems to be installed, giving up!\n}
+    =>
+    qq{neither objdump nor readelf seems to be installed, giving up!\n},
 
-	q{no}
-	=>
-	qq{no},
+    q{no}
+    =>
+    qq{no},
 
-	q{Our schema-version is %s, DB is %s, upgrading DB...}
-	=>
-	qq{Our schema-version is %s, DB is %s, upgrading DB...},
+    q{Our schema-version is %s, DB is %s, upgrading DB...}
+    =>
+    qq{Our schema-version is %s, DB is %s, upgrading DB...},
 
-	q{PXE-system %s already exists!}
-	=>
-	qq{PXE-system %s already exists!},
+    q{PXE-system %s already exists!}
+    =>
+    qq{PXE-system %s already exists!},
 
-	q{removing %s}
-	=>
-	qq{removing %s},
+    q{removing %s}
+    =>
+    qq{removing %s},
 
-	q{setting %s to <%s>}
-	=>
-	qq{setting %s to <%s>},
+    q{setting %s to <%s>}
+    =>
+    qq{setting %s to <%s>},
 
-	q{slxldd: unable to find file '%s', skipping it\n}
-	=>
-	qq{slxldd: unable to find file '%s', skipping it\n},
+    q{slxldd: unable to find file '%s', skipping it\n}
+    =>
+    qq{slxldd: unable to find file '%s', skipping it\n},
 
-	q{Sorry, system '%s' is unsupported.\n}
-	=>
-	qq{Sorry, system '%s' is unsupported.\n},
+    q{Sorry, system '%s' is unsupported.\n}
+    =>
+    qq{Sorry, system '%s' is unsupported.\n},
 
-	q{system-error: illegal target-path <%s>!}
-	=>
-	qq{system-error: illegal target-path <%s>!},
+    q{system-error: illegal target-path <%s>!}
+    =>
+    qq{system-error: illegal target-path <%s>!},
 
-	q{This will overwrite the current OpenSLX-database with an example dataset.\nAll your data (%s systems and %s clients) will be lost!\nDo you want to continue(%s/%s)? }
-	=>
-	qq{This will overwrite the current OpenSLX-database with an example dataset.\nAll your data (%s systems and %s clients) will be lost!\nDo you want to continue(%s/%s)? },
+    q{This will overwrite the current OpenSLX-database with an example dataset.\nAll your data (%s systems and %s clients) will be lost!\nDo you want to continue(%s/%s)? }
+    =>
+    qq{This will overwrite the current OpenSLX-database with an example dataset.\nAll your data (%s systems and %s clients) will be lost!\nDo you want to continue(%s/%s)? },
 
-	q{translations module %s loaded successfully}
-	=>
-	qq{translations module %s loaded successfully},
+    q{translations module %s loaded successfully}
+    =>
+    qq{translations module %s loaded successfully},
 
-	q{Unable to access client-config-path '%s'!}
-	=>
-	qq{Unable to access client-config-path '%s'!},
+    q{Unable to access client-config-path '%s'!}
+    =>
+    qq{Unable to access client-config-path '%s'!},
 
-	q{unable to create db-datadir %s! (%s)\n}
-	=>
-	qq{unable to create db-datadir %s! (%s)\n},
+    q{unable to create db-datadir %s! (%s)\n}
+    =>
+    qq{unable to create db-datadir %s! (%s)\n},
 
-	q{Unable to create lock-file <%s>, exiting!\n}
-	=>
-	qq{Unable to create lock-file <%s>, exiting!\n},
+    q{Unable to create lock-file <%s>, exiting!\n}
+    =>
+    qq{Unable to create lock-file <%s>, exiting!\n},
 
-	q{Unable to create or access temp-path '%s'!}
-	=>
-	qq{Unable to create or access temp-path '%s'!},
+    q{Unable to create or access temp-path '%s'!}
+    =>
+    qq{Unable to create or access temp-path '%s'!},
 
-	q{Unable to create or access tftpboot-path '%s'!}
-	=>
-	qq{Unable to create or access tftpboot-path '%s'!},
+    q{Unable to create or access tftpboot-path '%s'!}
+    =>
+    qq{Unable to create or access tftpboot-path '%s'!},
 
-	q{unable to execute shell-command:\n\t%s \n\t(%s)}
-	=>
-	qq{unable to execute shell-command:\n\t%s \n\t(%s)},
+    q{unable to execute shell-command:\n\t%s \n\t(%s)}
+    =>
+    qq{unable to execute shell-command:\n\t%s \n\t(%s)},
 
-	q{unable to fetch file info for '%s', giving up!\n}
-	=>
-	qq{unable to fetch file info for '%s', giving up!\n},
+    q{unable to fetch file info for '%s', giving up!\n}
+    =>
+    qq{unable to fetch file info for '%s', giving up!\n},
 
-	q{Unable to load DB-module <%s> (%s)\n}
-	=>
-	qq{Unable to load DB-module <%s> (%s)\n},
+    q{Unable to load DB-module <%s> (%s)\n}
+    =>
+    qq{Unable to load DB-module <%s> (%s)\n},
 
-	q{Unable to load DB-module <%s>\nthat database type is not supported (yet?)\n}
-	=>
-	qq{Unable to load DB-module <%s>\nthat database type is not supported (yet?)\n},
+    q{Unable to load DB-module <%s>\nthat database type is not supported (yet?)\n}
+    =>
+    qq{Unable to load DB-module <%s>\nthat database type is not supported (yet?)\n},
 
-	q{unable to load DHCP-Export backend '%s'! (%s)\n}
-	=>
-	qq{unable to load DHCP-Export backend '%s'! (%s)\n},
+    q{unable to load DHCP-Export backend '%s'! (%s)\n}
+    =>
+    qq{unable to load DHCP-Export backend '%s'! (%s)\n},
 
-	q{Unable to load module <%s> (Version <%s> required)}
-	=>
-	qq{Unable to load module <%s> (Version <%s> required)},
+    q{Unable to load module <%s> (Version <%s> required)}
+    =>
+    qq{Unable to load module <%s> (Version <%s> required)},
 
-	q{Unable to load module <%s> (Version <%s> required, but <%s> found)}
-	=>
-	qq{Unable to load module <%s> (Version <%s> required, but <%s> found)},
+    q{Unable to load module <%s> (Version <%s> required, but <%s> found)}
+    =>
+    qq{Unable to load module <%s> (Version <%s> required, but <%s> found)},
 
-	q{Unable to load system-module <%s> (%s)\n}
-	=>
-	qq{Unable to load system-module <%s> (%s)\n},
+    q{Unable to load system-module <%s> (%s)\n}
+    =>
+    qq{Unable to load system-module <%s> (%s)\n},
 
-	q{Unable to load system-module <%s>!\n}
-	=>
-	qq{Unable to load system-module <%s>!\n},
+    q{Unable to load system-module <%s>!\n}
+    =>
+    qq{Unable to load system-module <%s>!\n},
 
-	q{Unable to write local settings file <%s> (%s)}
-	=>
-	qq{Unable to write local settings file <%s> (%s)},
+    q{Unable to write local settings file <%s> (%s)}
+    =>
+    qq{Unable to write local settings file <%s> (%s)},
 
-	q{unknown settings key <%s>!\n}
-	=>
-	qq{unknown settings key <%s>!\n},
+    q{unknown settings key <%s>!\n}
+    =>
+    qq{unknown settings key <%s>!\n},
 
-	q{UnknownDbSchemaColumnDescr}
-	=>
-	qq{UnknownDbSchemaColumnDescr},
+    q{UnknownDbSchemaColumnDescr}
+    =>
+    qq{UnknownDbSchemaColumnDescr},
 
-	q{UnknownDbSchemaCommand}
-	=>
-	qq{UnknownDbSchemaCommand},
+    q{UnknownDbSchemaCommand}
+    =>
+    qq{UnknownDbSchemaCommand},
 
-	q{UnknownDbSchemaTypeDescr}
-	=>
-	qq{UnknownDbSchemaTypeDescr},
+    q{UnknownDbSchemaTypeDescr}
+    =>
+    qq{UnknownDbSchemaTypeDescr},
 
-	q{upgrade done}
-	=>
-	qq{upgrade done},
+    q{upgrade done}
+    =>
+    qq{upgrade done},
 
-	q{writing dhcp-config for %s clients}
-	=>
-	qq{writing dhcp-config for %s clients},
+    q{writing dhcp-config for %s clients}
+    =>
+    qq{writing dhcp-config for %s clients},
 
-	q{writing PXE-file %s}
-	=>
-	qq{writing PXE-file %s},
+    q{writing PXE-file %s}
+    =>
+    qq{writing PXE-file %s},
 
-	q{yes}
-	=>
-	qq{yes},
+    q{yes}
+    =>
+    qq{yes},
 
-	q{You need to specify at least one file!\n}
-	=>
-	qq{You need to specify at least one file!\n},
+    q{You need to specify at least one file!\n}
+    =>
+    qq{You need to specify at least one file!\n},
 
-	q{You need to specify exactly one system name!\n}
-	=>
-	qq{You need to specify exactly one system name!\n},
+    q{You need to specify exactly one system name!\n}
+    =>
+    qq{You need to specify exactly one system name!\n},
 
-	q{You need to specify the root-path!\n}
-	=>
-	qq{You need to specify the root-path!\n},
+    q{You need to specify the root-path!\n}
+    =>
+    qq{You need to specify the root-path!\n},
 
 );
 
diff --git a/lib/OpenSLX/Utils.pm b/lib/OpenSLX/Utils.pm
index 9d8b4599..130a3a01 100644
--- a/lib/OpenSLX/Utils.pm
+++ b/lib/OpenSLX/Utils.pm
@@ -9,7 +9,7 @@
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
 # Utils.pm
-#	- provides utility functions for OpenSLX
+#    - provides utility functions for OpenSLX
 # -----------------------------------------------------------------------------
 package OpenSLX::Utils;
 
@@ -49,280 +49,280 @@ use OpenSLX::Basics;
 
 sub copyFile
 {
-	my $fileName       = shift || croak 'need to pass in a fileName!';
-	my $targetDir      = shift || croak 'need to pass in target dir!';
-	my $targetFileName = shift || '';
-
-	mkpath($targetDir) unless -d $targetDir;
-	my $target = "$targetDir/$targetFileName";
-	vlog(2, _tr("copying '%s' to '%s'", $fileName, $target));
-	if (system("cp -p $fileName $target")) {
-		croak(
-			_tr(
-				"unable to copy file '%s' to dir '%s' (%s)",
-				$fileName, $target, $!
-			)
-		);
-	}
-	return;
+    my $fileName       = shift || croak 'need to pass in a fileName!';
+    my $targetDir      = shift || croak 'need to pass in target dir!';
+    my $targetFileName = shift || '';
+
+    mkpath($targetDir) unless -d $targetDir;
+    my $target = "$targetDir/$targetFileName";
+    vlog(2, _tr("copying '%s' to '%s'", $fileName, $target));
+    if (system("cp -p $fileName $target")) {
+        croak(
+            _tr(
+                "unable to copy file '%s' to dir '%s' (%s)",
+                $fileName, $target, $!
+            )
+        );
+    }
+    return;
 }
 
 sub fakeFile
 {
-	my $fullPath = shift || croak 'need to pass in full path!';
-
-	my $targetDir = dirname($fullPath);
-	mkpath($targetDir) unless -d $targetDir;
-	if (system("touch", $fullPath)) {
-		croak(_tr("unable to create file '%s' (%s)", $fullPath, $!));
-	}
-	return;
+    my $fullPath = shift || croak 'need to pass in full path!';
+
+    my $targetDir = dirname($fullPath);
+    mkpath($targetDir) unless -d $targetDir;
+    if (system("touch", $fullPath)) {
+        croak(_tr("unable to create file '%s' (%s)", $fullPath, $!));
+    }
+    return;
 }
 
 sub linkFile
 {
-	my $linkTarget = shift || croak 'need to pass in link target!';
-	my $linkName   = shift || croak 'need to pass in link name!';
-
-	my $targetDir = dirname($linkName);
-	mkpath($targetDir) unless -d $targetDir;
-	if (system("ln -sfn $linkTarget $linkName")) {
-		croak(
-			_tr(
-				"unable to create link '%s' to '%s' (%s)",
-				$linkName, $linkTarget, $!
-			)
-		);
-	}
-	return;
+    my $linkTarget = shift || croak 'need to pass in link target!';
+    my $linkName   = shift || croak 'need to pass in link name!';
+
+    my $targetDir = dirname($linkName);
+    mkpath($targetDir) unless -d $targetDir;
+    if (system("ln -sfn $linkTarget $linkName")) {
+        croak(
+            _tr(
+                "unable to create link '%s' to '%s' (%s)",
+                $linkName, $linkTarget, $!
+            )
+        );
+    }
+    return;
 }
 
 sub slurpFile
 {
-	my $fileName = shift || confess 'need to pass in fileName!';
-	my $flags    = shift || {};
-
-	checkParams($flags, { 
-		'failIfMissing' => '?',
-		'io-layer' => '?',
-	});
-	my $failIfMissing 
-		= exists $flags->{failIfMissing} ? $flags->{failIfMissing} : 1;
-	my $ioLayer = $flags->{'io-layer'} || 'utf8';
-
-	my $fh;
-	if (!open($fh, "<:$ioLayer", $fileName)) {
-		return '' unless $failIfMissing;
-		croak _tr("could not open file '%s' for reading! (%s)", $fileName, $!);
-	}
-	if (wantarray()) {
-		my @content = <$fh>;
-		close($fh)
-		  or croak _tr("unable to close file '%s' (%s)\n", $fileName, $!);
-		return @content;
-	}
-	else  {
-		local $/;
-		my $content = <$fh>;
-		close($fh)
-		  or croak _tr("unable to close file '%s' (%s)\n", $fileName, $!);
-		return $content;
-	}
+    my $fileName = shift || confess 'need to pass in fileName!';
+    my $flags    = shift || {};
+
+    checkParams($flags, { 
+        'failIfMissing' => '?',
+        'io-layer' => '?',
+    });
+    my $failIfMissing 
+        = exists $flags->{failIfMissing} ? $flags->{failIfMissing} : 1;
+    my $ioLayer = $flags->{'io-layer'} || 'utf8';
+
+    my $fh;
+    if (!open($fh, "<:$ioLayer", $fileName)) {
+        return '' unless $failIfMissing;
+        croak _tr("could not open file '%s' for reading! (%s)", $fileName, $!);
+    }
+    if (wantarray()) {
+        my @content = <$fh>;
+        close($fh)
+          or croak _tr("unable to close file '%s' (%s)\n", $fileName, $!);
+        return @content;
+    }
+    else  {
+        local $/;
+        my $content = <$fh>;
+        close($fh)
+          or croak _tr("unable to close file '%s' (%s)\n", $fileName, $!);
+        return $content;
+    }
 }
 
 sub spitFile
 {
-	my $fileName = shift || croak 'need to pass in a fileName!';
-	my $content  = shift || '';
-	my $flags    = shift || {};
-
-	checkParams($flags, { 
-		'io-layer' => '?',
-		'mode'     => '?',
-	});
-	my $ioLayer = $flags->{'io-layer'} || 'utf8';
-
-	my $fh;
-	open($fh, ">:$ioLayer", $fileName)
-		or croak _tr("unable to create file '%s' (%s)\n", $fileName, $!);
-	print $fh $content
-		or croak _tr("unable to print to file '%s' (%s)\n", $fileName, $!);
-	close($fh)
-		or croak _tr("unable to close file '%s' (%s)\n", $fileName, $!);
-	if (defined $flags->{mode}) {
-		chmod $flags->{mode}, $fileName;
-	}
-	return;
+    my $fileName = shift || croak 'need to pass in a fileName!';
+    my $content  = shift || '';
+    my $flags    = shift || {};
+
+    checkParams($flags, { 
+        'io-layer' => '?',
+        'mode'     => '?',
+    });
+    my $ioLayer = $flags->{'io-layer'} || 'utf8';
+
+    my $fh;
+    open($fh, ">:$ioLayer", $fileName)
+        or croak _tr("unable to create file '%s' (%s)\n", $fileName, $!);
+    print $fh $content
+        or croak _tr("unable to print to file '%s' (%s)\n", $fileName, $!);
+    close($fh)
+        or croak _tr("unable to close file '%s' (%s)\n", $fileName, $!);
+    if (defined $flags->{mode}) {
+        chmod $flags->{mode}, $fileName;
+    }
+    return;
 }
 
 sub appendFile
 {
-	my $fileName = shift || croak 'need to pass in a fileName!';
-	my $content  = shift;
-	my $flags    = shift || {};
-
-	checkParams($flags, { 
-		'io-layer' => '?',
-	});
-	my $ioLayer = $flags->{'io-layer'} || 'utf8';
-
-	my $fh;
-	open($fh, ">>:$ioLayer", $fileName)
-	  or croak _tr("unable to create file '%s' (%s)\n", $fileName, $!);
-	print $fh $content
-	  or croak _tr("unable to print to file '%s' (%s)\n", $fileName, $!);
-	close($fh)
-	  or croak _tr("unable to close file '%s' (%s)\n", $fileName, $!);
-	return;
+    my $fileName = shift || croak 'need to pass in a fileName!';
+    my $content  = shift;
+    my $flags    = shift || {};
+
+    checkParams($flags, { 
+        'io-layer' => '?',
+    });
+    my $ioLayer = $flags->{'io-layer'} || 'utf8';
+
+    my $fh;
+    open($fh, ">>:$ioLayer", $fileName)
+      or croak _tr("unable to create file '%s' (%s)\n", $fileName, $!);
+    print $fh $content
+      or croak _tr("unable to print to file '%s' (%s)\n", $fileName, $!);
+    close($fh)
+      or croak _tr("unable to close file '%s' (%s)\n", $fileName, $!);
+    return;
 }
 
 sub followLink
 {
-	my $path         = shift || croak 'need to pass in a path!';
-	my $prefixedPath = shift || '';
-
-	my $target;
-	while (-l "$path") {
-		$target = readlink "$path";
-		if (substr($target, 0, 1) eq '/') {
-			$path = "$prefixedPath$target";
-		}
-		else {
-			$path = $prefixedPath . dirname($path) . '/' . $target;
-		}
-	}
-	return $path;
+    my $path         = shift || croak 'need to pass in a path!';
+    my $prefixedPath = shift || '';
+
+    my $target;
+    while (-l "$path") {
+        $target = readlink "$path";
+        if (substr($target, 0, 1) eq '/') {
+            $path = "$prefixedPath$target";
+        }
+        else {
+            $path = $prefixedPath . dirname($path) . '/' . $target;
+        }
+    }
+    return $path;
 }
 
 sub copyBinaryWithRequiredLibs {
-	my $params = shift;
-	
-	checkParams($params, {
-		'binary'       	  => '!',	# file to copy
-		'targetFolder'    => '!',	# where file shall be copied to
-		'libTargetFolder' => '!',	# base target folder for libs
-		'targetName'      => '?',	# name of binary in target folder
-	});
-	copyFile($params->{binary}, $params->{targetFolder}, $params->{targetName});
-
-	# determine all required libraries and copy those, too:
-	vlog(1, _tr("calling slxldd for $params->{binary}"));
-	my $slxlddCmd = "slxldd $params->{binary}";
-	vlog(2, "executing: $slxlddCmd");
-	my $requiredLibsStr = qx{$slxlddCmd};
-	if ($?) {
-		die _tr(
-			"slxldd couldn't determine the libs required by '%s'! (%s)", 
-			$params->{binary}, $?
-		);
-	}
-	chomp $requiredLibsStr;
-	vlog(2, "slxldd results:\n$requiredLibsStr");
-	
-	foreach my $lib (split "\n", $requiredLibsStr) {
-		my $libDir = dirname($lib);
-		my $targetLib = "$params->{libTargetFolder}$libDir";
-		next if -e "$targetLib/$lib";
-		vlog(3, "copying lib '$lib'");
-		copyFile($lib, $targetLib);
-	}
-	return $requiredLibsStr;
+    my $params = shift;
+    
+    checkParams($params, {
+        'binary'             => '!',    # file to copy
+        'targetFolder'    => '!',    # where file shall be copied to
+        'libTargetFolder' => '!',    # base target folder for libs
+        'targetName'      => '?',    # name of binary in target folder
+    });
+    copyFile($params->{binary}, $params->{targetFolder}, $params->{targetName});
+
+    # determine all required libraries and copy those, too:
+    vlog(1, _tr("calling slxldd for $params->{binary}"));
+    my $slxlddCmd = "slxldd $params->{binary}";
+    vlog(2, "executing: $slxlddCmd");
+    my $requiredLibsStr = qx{$slxlddCmd};
+    if ($?) {
+        die _tr(
+            "slxldd couldn't determine the libs required by '%s'! (%s)", 
+            $params->{binary}, $?
+        );
+    }
+    chomp $requiredLibsStr;
+    vlog(2, "slxldd results:\n$requiredLibsStr");
+    
+    foreach my $lib (split "\n", $requiredLibsStr) {
+        my $libDir = dirname($lib);
+        my $targetLib = "$params->{libTargetFolder}$libDir";
+        next if -e "$targetLib/$lib";
+        vlog(3, "copying lib '$lib'");
+        copyFile($lib, $targetLib);
+    }
+    return $requiredLibsStr;
 }
 
 sub unshiftHereDoc
 {
-	my $content = shift;
-	return $content unless $content =~ m{^(\s+)};
-	my $shiftStr = $1;
-	$content =~ s[^$shiftStr][]gms;
-	return $content;
+    my $content = shift;
+    return $content unless $content =~ m{^(\s+)};
+    my $shiftStr = $1;
+    $content =~ s[^$shiftStr][]gms;
+    return $content;
 }
 
 sub string2Array
 {
-	my $string = shift || '';
+    my $string = shift || '';
 
-	my @lines = split m[\n], $string;
-	for my $line (@lines) {
-		# remove leading and trailing whitespace:
-		$line =~ s{^\s*(.*?)\s*$}{$1};
-	}
+    my @lines = split m[\n], $string;
+    for my $line (@lines) {
+        # remove leading and trailing whitespace:
+        $line =~ s{^\s*(.*?)\s*$}{$1};
+    }
 
-	# drop empty lines and comments:
-	return grep { length($_) > 0 && $_ !~ m[^\s*#]; } @lines;
+    # drop empty lines and comments:
+    return grep { length($_) > 0 && $_ !~ m[^\s*#]; } @lines;
 }
 
 sub chrootInto
 {
-	my $osDir = shift;
+    my $osDir = shift;
 
-	vlog(2, "chrooting into $osDir...");
-	chdir $osDir
-		or die _tr("unable to chdir into '%s' (%s)\n", $osDir, $!);
+    vlog(2, "chrooting into $osDir...");
+    chdir $osDir
+        or die _tr("unable to chdir into '%s' (%s)\n", $osDir, $!);
 
-	# ...do chroot
-	chroot "."
-		or die _tr("unable to chroot into '%s' (%s)\n", $osDir, $!);
-	return;
+    # ...do chroot
+    chroot "."
+        or die _tr("unable to chroot into '%s' (%s)\n", $osDir, $!);
+    return;
 }
 
 sub mergeHash
 {
-	my $targetHash = shift;
-	my $sourceHash = shift;
-	my $fillOnly   = shift || 0;
-	
-	foreach my $key (keys %{$sourceHash}) {
-		my $sourceVal = $sourceHash->{$key};
-		if (ref($sourceVal) eq 'HASH') {
-			if (!exists $targetHash->{$key}) {
-				$targetHash->{$key} = {};
-			}
-			mergeHash($targetHash->{$key}, $sourceVal);
-		}
-		elsif (ref($sourceVal) eq 'ARRAY') {
-			if (!exists $targetHash->{$key}) {
-				$targetHash->{$key} = [];
-			}
-			foreach my $val (@{$sourceHash->{$key}}) {
-				my $targetVal = {};
-				push @{$targetHash->{$key}}, $targetVal;
-				mergeHash($targetVal, $sourceVal);
-			}
-		}
-		else {
-			next if $fillOnly && exists $targetHash->{$key};
-			$targetHash->{$key} = $sourceVal;
-		}
-	}
+    my $targetHash = shift;
+    my $sourceHash = shift;
+    my $fillOnly   = shift || 0;
+    
+    foreach my $key (keys %{$sourceHash}) {
+        my $sourceVal = $sourceHash->{$key};
+        if (ref($sourceVal) eq 'HASH') {
+            if (!exists $targetHash->{$key}) {
+                $targetHash->{$key} = {};
+            }
+            mergeHash($targetHash->{$key}, $sourceVal);
+        }
+        elsif (ref($sourceVal) eq 'ARRAY') {
+            if (!exists $targetHash->{$key}) {
+                $targetHash->{$key} = [];
+            }
+            foreach my $val (@{$sourceHash->{$key}}) {
+                my $targetVal = {};
+                push @{$targetHash->{$key}}, $targetVal;
+                mergeHash($targetVal, $sourceVal);
+            }
+        }
+        else {
+            next if $fillOnly && exists $targetHash->{$key};
+            $targetHash->{$key} = $sourceVal;
+        }
+    }
 }
 
 sub getFQDN
 {
-	my $hostName = hostname();
-	
-	my $hostAddr = gethostbyname($hostName)
-		or die(_tr("unable to get address of host '%s'", $hostName));
-	my $FQDN = gethostbyaddr($hostAddr, AF_INET)
-		or die(_tr("unable to get dns-name of address '%s'", $hostAddr));
-	return $FQDN;
+    my $hostName = hostname();
+    
+    my $hostAddr = gethostbyname($hostName)
+        or die(_tr("unable to get address of host '%s'", $hostName));
+    my $FQDN = gethostbyaddr($hostAddr, AF_INET)
+        or die(_tr("unable to get dns-name of address '%s'", $hostAddr));
+    return $FQDN;
 }
 
 sub readPassword
 {
-	my $prompt = shift;
-	
-	my $term = Term::ReadLine->new('slx');
-	my $attribs = $term->Attribs;
-	$attribs->{redisplay_function} = $attribs->{shadow_redisplay};
+    my $prompt = shift;
+    
+    my $term = Term::ReadLine->new('slx');
+    my $attribs = $term->Attribs;
+    $attribs->{redisplay_function} = $attribs->{shadow_redisplay};
 
     return $term->readline($prompt);
 }
 
 sub hostIs64Bit
 {
-	my $arch = qx{uname -m};
-	return $arch =~ m[64];
+    my $arch = qx{uname -m};
+    return $arch =~ m[64];
 }
 
 1;
diff --git a/lib/distro-info/debian-3.1/settings.default b/lib/distro-info/debian-3.1/settings.default
index 9af7d3ef..50b12768 100644
--- a/lib/distro-info/debian-3.1/settings.default
+++ b/lib/distro-info/debian-3.1/settings.default
@@ -3,39 +3,39 @@ package-subdir = pool
 prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2_all.deb
 release-name = sarge
 <repository base>
-	components = main
-	distribution = sarge
-	name = Debian 3.1
-	repo-subdir = dists
-	file-for-speedtest = dists/sarge/main/binary-i386/Packages.gz
+    components = main
+    distribution = sarge
+    name = Debian 3.1
+    repo-subdir = dists
+    file-for-speedtest = dists/sarge/main/binary-i386/Packages.gz
 </repository>
 <selection minimal>
-	packages = <<END
-		kernel-image-2.6-386
-		locales
-	END
+    packages = <<END
+        kernel-image-2.6-386
+        locales
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		gnome
-	END
+    base = minimal
+    packages = <<END
+        gnome
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-		kde
-	END
+    base = minimal
+    packages = <<END
+        kde
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
 <selection openslx-build>
-	base = minimal
-	packages = <<END
-		bzip2
-		gcc
-		libc6-dev
-		make
-	END
+    base = minimal
+    packages = <<END
+        bzip2
+        gcc
+        libc6-dev
+        make
+    END
 </selection>
diff --git a/lib/distro-info/debian-3.1/settings.example b/lib/distro-info/debian-3.1/settings.example
index d09a8710..ac54855d 100644
--- a/lib/distro-info/debian-3.1/settings.example
+++ b/lib/distro-info/debian-3.1/settings.example
@@ -10,8 +10,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/debian-4.0/settings.default b/lib/distro-info/debian-4.0/settings.default
index 9ec54e23..075754e3 100644
--- a/lib/distro-info/debian-4.0/settings.default
+++ b/lib/distro-info/debian-4.0/settings.default
@@ -3,30 +3,30 @@ package-subdir = pool
 prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2etch1_all.deb
 release-name = etch
 <repository base>
-	components = main
-	distribution = etch
-	name = Debian 4.0
-	repo-subdir = dists
-	file-for-speedtest = dists/etch/main/binary-i386/Packages.bz2
+    components = main
+    distribution = etch
+    name = Debian 4.0
+    repo-subdir = dists
+    file-for-speedtest = dists/etch/main/binary-i386/Packages.bz2
 </repository>
 <selection minimal>
-	packages = <<END
-		linux-image-486
-		locales-all
-	END
+    packages = <<END
+        linux-image-486
+        locales-all
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		gnome
-	END
+    base = minimal
+    packages = <<END
+        gnome
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-		kde
-	END
+    base = minimal
+    packages = <<END
+        kde
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/debian-4.0/settings.example b/lib/distro-info/debian-4.0/settings.example
index d09a8710..ac54855d 100644
--- a/lib/distro-info/debian-4.0/settings.example
+++ b/lib/distro-info/debian-4.0/settings.example
@@ -10,8 +10,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/debian-4.0_amd64/settings.default b/lib/distro-info/debian-4.0_amd64/settings.default
index be46fe14..22126f66 100644
--- a/lib/distro-info/debian-4.0_amd64/settings.default
+++ b/lib/distro-info/debian-4.0_amd64/settings.default
@@ -3,39 +3,39 @@ package-subdir = pool
 prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2etch1_all.deb
 release-name = etch
 <repository base>
-	components = main
-	distribution = etch
-	name = Debian 4.0
-	repo-subdir = dists
-	file-for-speedtest = dists/etch/main/binary-amd64/Packages.bz2
+    components = main
+    distribution = etch
+    name = Debian 4.0
+    repo-subdir = dists
+    file-for-speedtest = dists/etch/main/binary-amd64/Packages.bz2
 </repository>
 <selection minimal>
-	packages = <<END
-		linux-image-amd64
-		locales-all
-	END
+    packages = <<END
+        linux-image-amd64
+        locales-all
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		gnome
-	END
+    base = minimal
+    packages = <<END
+        gnome
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-		kde
-	END
+    base = minimal
+    packages = <<END
+        kde
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
 <selection openslx-build>
-	base = minimal
-	packages = <<END
-		bzip2
-		gcc
-		libc6-dev
-		make
-	END
+    base = minimal
+    packages = <<END
+        bzip2
+        gcc
+        libc6-dev
+        make
+    END
 </selection>
diff --git a/lib/distro-info/debian-4.0_amd64/settings.example b/lib/distro-info/debian-4.0_amd64/settings.example
index d09a8710..ac54855d 100644
--- a/lib/distro-info/debian-4.0_amd64/settings.example
+++ b/lib/distro-info/debian-4.0_amd64/settings.example
@@ -10,8 +10,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/fedora-6/settings.default b/lib/distro-info/fedora-6/settings.default
index f49856e9..53dfbe74 100644
--- a/lib/distro-info/fedora-6/settings.default
+++ b/lib/distro-info/fedora-6/settings.default
@@ -1,125 +1,125 @@
 bootstrap-packages = <<END
-	audit-libs-1.2.8-1.fc6.i386.rpm
-	basesystem-8.0-5.1.1.noarch.rpm
-	bash-3.1-16.1.i386.rpm
-	beecrypt-4.1.2-10.1.1.i386.rpm
-	bzip2-libs-1.0.3-3.i386.rpm
-	chkconfig-1.3.30-1.i386.rpm
-	coreutils-5.97-11.i386.rpm
-	cpio-2.6-19.i386.rpm
-	cracklib-2.8.9-3.1.i386.rpm
-	cracklib-dicts-2.8.9-3.1.i386.rpm
-	db4-4.3.29-9.fc6.i386.rpm
-	device-mapper-1.02.07-3.i386.rpm
-	dmraid-1.0.0.rc13-1.fc6.i386.rpm
-	e2fsprogs-1.39-7.i386.rpm
-	e2fsprogs-libs-1.39-7.i386.rpm
-	elfutils-libelf-0.123-1.fc6.i386.rpm
-	ethtool-3-1.2.2.i386.rpm
-	expat-1.95.8-8.2.1.i386.rpm
-	fedora-release-6-4.noarch.rpm
-	fedora-release-notes-6-3.noarch.rpm
-	filesystem-2.4.0-1.i386.rpm
-	findutils-4.2.27-4.1.i386.rpm
-	gawk-3.1.5-11.i386.rpm
-	gdbm-1.8.0-26.2.1.i386.rpm
-	glib2-2.12.3-2.fc6.i386.rpm
-	glibc-2.5-3.i386.rpm
-	glibc-common-2.5-3.i386.rpm
-	grep-2.5.1-54.1.i386.rpm
-	gzip-1.3.5-9.i386.rpm
-	info-4.8-11.1.i386.rpm
-	initscripts-8.45.3-1.i386.rpm
-	iproute-2.6.16-6.fc6.i386.rpm
-	iputils-20020927-41.fc6.i386.rpm
-	kernel-2.6.18-1.2798.fc6.i586.rpm
-	kpartx-0.4.7-5.i386.rpm
-	krb5-libs-1.5-7.i386.rpm
-	less-394-4.1.i386.rpm
-	libacl-2.2.39-1.1.i386.rpm
-	libattr-2.4.32-1.1.i386.rpm
-	libcap-1.10-25.i386.rpm
-	libgcc-4.1.1-30.i386.rpm
-	libselinux-1.30.29-2.i386.rpm
-	libsepol-1.12.27-1.i386.rpm
-	libstdc++-4.1.1-30.i386.rpm
-	libtermcap-2.0.8-46.1.i386.rpm
-	lvm2-2.02.06-4.i386.rpm
-	MAKEDEV-3.23-1.2.i386.rpm
-	mcstrans-0.1.8-3.i386.rpm
-	mingetty-1.07-5.2.2.i386.rpm
-	mkinitrd-5.1.19-1.i386.rpm
-	mktemp-1.5-23.2.2.i386.rpm
-	module-init-tools-3.3-0.pre1.4.17.i386.rpm
-	nash-5.1.19-1.i386.rpm
-	ncurses-5.5-24.20060715.i386.rpm
-	neon-0.25.5-5.1.i386.rpm
-	net-tools-1.60-73.i386.rpm
-	openssl-0.9.8b-8.i386.rpm
-	pam-0.99.6.2-3.fc6.i386.rpm
-	pcre-6.6-1.1.i386.rpm
-	popt-1.10.2-32.i386.rpm
-	procps-3.2.7-8.i386.rpm
-	psmisc-22.2-5.i386.rpm
-	python-2.4.3-18.fc6.i386.rpm
-	readline-5.1-1.1.i386.rpm
-	rpm-4.4.2-32.i386.rpm
-	rpm-libs-4.4.2-32.i386.rpm
-	sed-4.1.5-5.fc6.i386.rpm
-	setup-2.5.55-1.noarch.rpm
-	shadow-utils-4.0.17-5.i386.rpm
-	sqlite-3.3.6-2.i386.rpm
-	sysklogd-1.4.1-39.2.i386.rpm
-	SysVinit-2.86-14.i386.rpm
-	tar-1.15.1-19.i386.rpm
-	termcap-5.5-1.20060701.1.noarch.rpm
-	tzdata-2006m-2.fc6.noarch.rpm
-	udev-095-14.i386.rpm
-	util-linux-2.13-0.44.fc6.i386.rpm
-	zlib-1.2.3-3.i386.rpm
+    audit-libs-1.2.8-1.fc6.i386.rpm
+    basesystem-8.0-5.1.1.noarch.rpm
+    bash-3.1-16.1.i386.rpm
+    beecrypt-4.1.2-10.1.1.i386.rpm
+    bzip2-libs-1.0.3-3.i386.rpm
+    chkconfig-1.3.30-1.i386.rpm
+    coreutils-5.97-11.i386.rpm
+    cpio-2.6-19.i386.rpm
+    cracklib-2.8.9-3.1.i386.rpm
+    cracklib-dicts-2.8.9-3.1.i386.rpm
+    db4-4.3.29-9.fc6.i386.rpm
+    device-mapper-1.02.07-3.i386.rpm
+    dmraid-1.0.0.rc13-1.fc6.i386.rpm
+    e2fsprogs-1.39-7.i386.rpm
+    e2fsprogs-libs-1.39-7.i386.rpm
+    elfutils-libelf-0.123-1.fc6.i386.rpm
+    ethtool-3-1.2.2.i386.rpm
+    expat-1.95.8-8.2.1.i386.rpm
+    fedora-release-6-4.noarch.rpm
+    fedora-release-notes-6-3.noarch.rpm
+    filesystem-2.4.0-1.i386.rpm
+    findutils-4.2.27-4.1.i386.rpm
+    gawk-3.1.5-11.i386.rpm
+    gdbm-1.8.0-26.2.1.i386.rpm
+    glib2-2.12.3-2.fc6.i386.rpm
+    glibc-2.5-3.i386.rpm
+    glibc-common-2.5-3.i386.rpm
+    grep-2.5.1-54.1.i386.rpm
+    gzip-1.3.5-9.i386.rpm
+    info-4.8-11.1.i386.rpm
+    initscripts-8.45.3-1.i386.rpm
+    iproute-2.6.16-6.fc6.i386.rpm
+    iputils-20020927-41.fc6.i386.rpm
+    kernel-2.6.18-1.2798.fc6.i586.rpm
+    kpartx-0.4.7-5.i386.rpm
+    krb5-libs-1.5-7.i386.rpm
+    less-394-4.1.i386.rpm
+    libacl-2.2.39-1.1.i386.rpm
+    libattr-2.4.32-1.1.i386.rpm
+    libcap-1.10-25.i386.rpm
+    libgcc-4.1.1-30.i386.rpm
+    libselinux-1.30.29-2.i386.rpm
+    libsepol-1.12.27-1.i386.rpm
+    libstdc++-4.1.1-30.i386.rpm
+    libtermcap-2.0.8-46.1.i386.rpm
+    lvm2-2.02.06-4.i386.rpm
+    MAKEDEV-3.23-1.2.i386.rpm
+    mcstrans-0.1.8-3.i386.rpm
+    mingetty-1.07-5.2.2.i386.rpm
+    mkinitrd-5.1.19-1.i386.rpm
+    mktemp-1.5-23.2.2.i386.rpm
+    module-init-tools-3.3-0.pre1.4.17.i386.rpm
+    nash-5.1.19-1.i386.rpm
+    ncurses-5.5-24.20060715.i386.rpm
+    neon-0.25.5-5.1.i386.rpm
+    net-tools-1.60-73.i386.rpm
+    openssl-0.9.8b-8.i386.rpm
+    pam-0.99.6.2-3.fc6.i386.rpm
+    pcre-6.6-1.1.i386.rpm
+    popt-1.10.2-32.i386.rpm
+    procps-3.2.7-8.i386.rpm
+    psmisc-22.2-5.i386.rpm
+    python-2.4.3-18.fc6.i386.rpm
+    readline-5.1-1.1.i386.rpm
+    rpm-4.4.2-32.i386.rpm
+    rpm-libs-4.4.2-32.i386.rpm
+    sed-4.1.5-5.fc6.i386.rpm
+    setup-2.5.55-1.noarch.rpm
+    shadow-utils-4.0.17-5.i386.rpm
+    sqlite-3.3.6-2.i386.rpm
+    sysklogd-1.4.1-39.2.i386.rpm
+    SysVinit-2.86-14.i386.rpm
+    tar-1.15.1-19.i386.rpm
+    termcap-5.5-1.20060701.1.noarch.rpm
+    tzdata-2006m-2.fc6.noarch.rpm
+    udev-095-14.i386.rpm
+    util-linux-2.13-0.44.fc6.i386.rpm
+    zlib-1.2.3-3.i386.rpm
 END
 <metapackager yum>
-	packages = <<END
-		libxml2-2.6.26-2.1.1.i386.rpm
-		python-elementtree-1.2.6-5.i386.rpm
-		python-sqlite-1.1.7-1.2.1.i386.rpm
-		python-urlgrabber-2.9.9-2.noarch.rpm
-		rpm-python-4.4.2-32.i386.rpm
-		yum-3.0-6.noarch.rpm
-		yum-metadata-parser-1.0-8.fc6.i386.rpm
-	END
+    packages = <<END
+        libxml2-2.6.26-2.1.1.i386.rpm
+        python-elementtree-1.2.6-5.i386.rpm
+        python-sqlite-1.1.7-1.2.1.i386.rpm
+        python-urlgrabber-2.9.9-2.noarch.rpm
+        rpm-python-4.4.2-32.i386.rpm
+        yum-3.0-6.noarch.rpm
+        yum-metadata-parser-1.0-8.fc6.i386.rpm
+    END
 </metapackager>
 package-subdir = Fedora/RPMS
 prereq-packages = <<END
-	beecrypt-4.1.2-10.1.1.i386.rpm
-	bzip2-libs-1.0.3-3.i386.rpm
-	e2fsprogs-libs-1.39-7.i386.rpm
-	elfutils-libelf-0.123-1.fc6.i386.rpm
-	expat-1.95.8-8.2.1.i386.rpm
-	glibc-2.5-3.i386.rpm
-	krb5-libs-1.5-7.i386.rpm
-	libgcc-4.1.1-30.i386.rpm
-	libselinux-1.30.29-2.i386.rpm
-	libsepol-1.12.27-1.i386.rpm
-	libstdc++-4.1.1-30.i386.rpm
-	neon-0.25.5-5.1.i386.rpm
-	openssl-0.9.8b-8.i386.rpm
-	popt-1.10.2-32.i386.rpm
-	rpm-4.4.2-32.i386.rpm
-	rpm-libs-4.4.2-32.i386.rpm
-	sqlite-3.3.6-2.i386.rpm
-	zlib-1.2.3-3.i386.rpm
+    beecrypt-4.1.2-10.1.1.i386.rpm
+    bzip2-libs-1.0.3-3.i386.rpm
+    e2fsprogs-libs-1.39-7.i386.rpm
+    elfutils-libelf-0.123-1.fc6.i386.rpm
+    expat-1.95.8-8.2.1.i386.rpm
+    glibc-2.5-3.i386.rpm
+    krb5-libs-1.5-7.i386.rpm
+    libgcc-4.1.1-30.i386.rpm
+    libselinux-1.30.29-2.i386.rpm
+    libsepol-1.12.27-1.i386.rpm
+    libstdc++-4.1.1-30.i386.rpm
+    neon-0.25.5-5.1.i386.rpm
+    openssl-0.9.8b-8.i386.rpm
+    popt-1.10.2-32.i386.rpm
+    rpm-4.4.2-32.i386.rpm
+    rpm-libs-4.4.2-32.i386.rpm
+    sqlite-3.3.6-2.i386.rpm
+    zlib-1.2.3-3.i386.rpm
 END
 <repository base>
-	name = Fedora Core 6
+    name = Fedora Core 6
 </repository>
 <repository base_update>
-	name = Fedora Core 6 updates
+    name = Fedora Core 6 updates
 </repository>
 <selection minimal>
-	packages = <<END
-	END
+    packages = <<END
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/fedora-6/settings.example b/lib/distro-info/fedora-6/settings.example
index 12845311..22883d4b 100644
--- a/lib/distro-info/fedora-6/settings.example
+++ b/lib/distro-info/fedora-6/settings.example
@@ -13,8 +13,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/fedora-6_x86_64/settings.default b/lib/distro-info/fedora-6_x86_64/settings.default
index bf97820a..3e940b94 100644
--- a/lib/distro-info/fedora-6_x86_64/settings.default
+++ b/lib/distro-info/fedora-6_x86_64/settings.default
@@ -1,125 +1,125 @@
 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
-	cracklib-2.8.9-3.1.x86_64.rpm
-	cracklib-dicts-2.8.9-3.1.x86_64.rpm
-	db4-4.3.29-9.fc6.x86_64.rpm
-	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
-	findutils-4.2.27-4.1.x86_64.rpm
-	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
-	info-4.8-11.1.x86_64.rpm
-	initscripts-8.45.3-1.x86_64.rpm
-	iproute-2.6.16-6.fc6.x86_64.rpm
-	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
-	mcstrans-0.1.8-3.x86_64.rpm
-	mingetty-1.07-5.2.2.x86_64.rpm
-	mkinitrd-5.1.19-1.x86_64.rpm
-	mktemp-1.5-23.2.2.x86_64.rpm
-	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
-	termcap-5.5-1.20060701.1.noarch.rpm
-	tzdata-2006m-2.fc6.noarch.rpm
-	udev-095-14.x86_64.rpm
-	util-linux-2.13-0.44.fc6.x86_64.rpm
-	zlib-1.2.3-3.x86_64.rpm
+    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
+    cracklib-2.8.9-3.1.x86_64.rpm
+    cracklib-dicts-2.8.9-3.1.x86_64.rpm
+    db4-4.3.29-9.fc6.x86_64.rpm
+    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
+    findutils-4.2.27-4.1.x86_64.rpm
+    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
+    info-4.8-11.1.x86_64.rpm
+    initscripts-8.45.3-1.x86_64.rpm
+    iproute-2.6.16-6.fc6.x86_64.rpm
+    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
+    mcstrans-0.1.8-3.x86_64.rpm
+    mingetty-1.07-5.2.2.x86_64.rpm
+    mkinitrd-5.1.19-1.x86_64.rpm
+    mktemp-1.5-23.2.2.x86_64.rpm
+    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
+    termcap-5.5-1.20060701.1.noarch.rpm
+    tzdata-2006m-2.fc6.noarch.rpm
+    udev-095-14.x86_64.rpm
+    util-linux-2.13-0.44.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
+    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
-	bzip2-libs-1.0.3-3.x86_64.rpm
-	e2fsprogs-libs-1.39-7.x86_64.rpm
-	elfutils-libelf-0.123-1.fc6.x86_64.rpm
-	expat-1.95.8-8.2.1.x86_64.rpm
-	glibc-2.5-3.x86_64.rpm
-	krb5-libs-1.5-7.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
-	neon-0.25.5-5.1.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
-	zlib-1.2.3-3.x86_64.rpm
+    beecrypt-4.1.2-10.1.1.x86_64.rpm
+    bzip2-libs-1.0.3-3.x86_64.rpm
+    e2fsprogs-libs-1.39-7.x86_64.rpm
+    elfutils-libelf-0.123-1.fc6.x86_64.rpm
+    expat-1.95.8-8.2.1.x86_64.rpm
+    glibc-2.5-3.x86_64.rpm
+    krb5-libs-1.5-7.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
+    neon-0.25.5-5.1.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
+    zlib-1.2.3-3.x86_64.rpm
 END
 <repository base>
-	name = Fedora Core 6
+    name = Fedora Core 6
 </repository>
 <repository base_update>
-	name = Fedora Core 6 updates
+    name = Fedora Core 6 updates
 </repository>
 <selection minimal>
-	packages = <<END
-	END
+    packages = <<END
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/fedora-6_x86_64/settings.example b/lib/distro-info/fedora-6_x86_64/settings.example
index 06642225..c41e6d33 100644
--- a/lib/distro-info/fedora-6_x86_64/settings.example
+++ b/lib/distro-info/fedora-6_x86_64/settings.example
@@ -13,8 +13,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/suse-10.1/settings.default b/lib/distro-info/suse-10.1/settings.default
index 2a4fdea9..e371142d 100644
--- a/lib/distro-info/suse-10.1/settings.default
+++ b/lib/distro-info/suse-10.1/settings.default
@@ -1,974 +1,974 @@
 bootstrap-packages = <<END
-	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/bzip2-1.0.3-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/glibc-2.4-25.i586.rpm i586/glibc-2.4-31.1.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.13-4.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/popt-1.7-268.i586.rpm
-	i586/readline-5.1-22.i586.rpm
-	i586/reiserfs-3.6.19-17.i586.rpm
-	i586/rpm-4.4.2-40.i586.rpm i586/rpm-4.4.2-43.4.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
-	i586/zlib-1.2.3-13.i586.rpm
-	noarch/suse-build-key-1.0-685.noarch.rpm
+    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/bzip2-1.0.3-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/glibc-2.4-25.i586.rpm i586/glibc-2.4-31.1.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.13-4.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/popt-1.7-268.i586.rpm
+    i586/readline-5.1-22.i586.rpm
+    i586/reiserfs-3.6.19-17.i586.rpm
+    i586/rpm-4.4.2-40.i586.rpm i586/rpm-4.4.2-43.4.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
+    i586/zlib-1.2.3-13.i586.rpm
+    noarch/suse-build-key-1.0-685.noarch.rpm
 END
 <metapackager smart>
-	packages = <<END
-		i586/python-2.4.2-18.i586.rpm
-		i586/python-elementtree-1.2.6-18.i586.rpm
-		i586/python-xml-2.4.2-18.i586.rpm
-		i586/rpm-python-4.4.2-40.i586.rpm
-		i586/smart-0.41-23.i586.rpm i586/smart-0.41-23.2.i586.rpm
-	END
+    packages = <<END
+        i586/python-2.4.2-18.i586.rpm
+        i586/python-elementtree-1.2.6-18.i586.rpm
+        i586/python-xml-2.4.2-18.i586.rpm
+        i586/rpm-python-4.4.2-40.i586.rpm
+        i586/smart-0.41-23.i586.rpm i586/smart-0.41-23.2.i586.rpm
+    END
 </metapackager>
 <metapackager yum>
-	packages = <<END
-		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
-	END
+    packages = <<END
+        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
+    END
 </metapackager>
 package-subdir = suse
 prereq-packages = <<END
-	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
+    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
 END
 <repository base>
-	name = SUSE Linux 10.1
-	repo-subdir = suse
-	file-for-speedtest = suse/setup/descr/packages.en
+    name = SUSE Linux 10.1
+    repo-subdir = suse
+    file-for-speedtest = suse/setup/descr/packages.en
 </repository>
 <repository base_non-oss>
-	name = openSUSE 10.1 non-OSS
-	repo-subdir = suse
-	file-for-speedtest = suse/setup/descr/packages.en
+    name = openSUSE 10.1 non-OSS
+    repo-subdir = suse
+    file-for-speedtest = suse/setup/descr/packages.en
 </repository>
 <repository base_update>
-	name = SUSE Linux 10.1 updates
-	file-for-speedtest = repodata/primary.xml.gz
+    name = SUSE Linux 10.1 updates
+    file-for-speedtest = repodata/primary.xml.gz
 </repository>
 <selection minimal>
-	packages = <<END
-		glibc-locale
-	END
+    packages = <<END
+        glibc-locale
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-	END
+    base = minimal
+    packages = <<END
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		3ddiag
-		855resolution
-		a2ps
-		aaa_base
-		aaa_skel
-		aalib
-		acl
-		acpid
-		alsa
-		alsa-firmware
-		alsa-tools
-		apparmor-docs
-		apparmor-parser
-		apparmor-profiles
-		apparmor-utils
-		arts
-		art-sharp
-		art-sharp2
-		ash
-		aspell
-		aspell-en
-		at
-		atk
-		at-spi
-		attr
-		audiofile
-		audit
-		audit-libs
-		autofs
-		autoyast2
-		autoyast2-installation
-		awesfx
-		banshee
-		banshee-engine-gst
-		banshee-plugins-DAAP
-		bash
-		bc
-		beagle
-		beagle-evolution
-		beagle-firefox
-		beagle-gui
-		beagle-index
-		bind-libs
-		bind-utils
-		binutils
-		bitstream-vera
-		blam
-		blocxx
-		blt
-		bluez-libs
-		bluez-utils
-		boost
-		bootsplash
-		bootsplash-theme-SuSE
-		bug-buddy
-		busybox
-		bzip2
-		cabextract
-		cairo
-		capi4linux
-		cdparanoia
-		cdrdao
-		cdrecord
-		CheckHardware
-		checkmedia
-		cifs-mount
-		compat
-		compat-curl2
-		compat-libstdc++
-		compat-openssl097g
-		contact-lookup-applet
-		control-center2
-		convmv
-		coreutils
-		cpio
-		cpp
-		cpufrequtils
-		cracklib
-		cron
-		Crystalcursors
-		cups
-		cups-client
-		cups-drivers
-		cups-drivers-stp
-		cups-libs
-		cups-SUSE-ppds-dat
-		curl
-		cyrus-sasl
-		cyrus-sasl-saslauthd
-		dasher
-		db
-		dbus-1
-		dbus-1-glib
-		dbus-1-gtk
-		dbus-1-mono
-		dbus-1-python
-		dbus-1-qt3
-		dbus-1-x11
-		dcraw
-		dejavu
-		deltarpm
-		desktop-data-SuSE
-		desktop-file-utils
-		desktop-translations
-		device-mapper
-		devs
-		dhcdbd
-		dhcp
-		dhcpcd
-		dhcp-client
-		dia
-		dialog
-		diffutils
-		DirectFB
-		dirmngr
-		dmraid
-		docbook_4
-		dos2unix
-		dosbootdisk
-		dosfstools
-		dvd+rw-tools
-		e2fsprogs
-		ed
-		eel
-		efont-unicode
-		eject
-		enigma
-		eog
-		epiphany
-		epiphany-extensions
-		esound
-		ethtool
-		evince
-		evolution
-		evolution-data-server
-		evolution-exchange
-		evolution-pilot
-		evolution-sharp
-		evolution-webcal
-		expat
-		fam
-		fam-server
-		fbset
-		festival
-		file
-		file-roller
-		fileshareset
-		filesystem
-		fillup
-		filters
-		findutils
-		finger
-		flac
-		fontconfig
-		fonts-config
-		foomatic-filters
-		freeciv
-		freeglut
-		freetype
-		freetype2
-		fribidi
-		frozen-bubble
-		f-spot
-		fvwm2
-		gail
-		gaim
-		gal2
-		gawk
-		gcalctool
-		gconf2
-		gconf-editor
-		gconf-sharp
-		gconf-sharp2
-		gdb
-		gdbm
-		gdk-pixbuf
-		gdm
-		gecko-sharp
-		gecko-sharp2
-		gedit
-		gettext
-		ghex
-		ghostscript-fonts-other
-		ghostscript-fonts-std
-		ghostscript-library
-		ghostscript-x11
-		giflib
-		gimp
-		gimp-cmyk
-		gimp-help
-		glade-sharp
-		glade-sharp2
-		gle
-		glib
-		glib2
-		glibc
-		glibc-i18ndata
-		glibc-locale
-		glibmm24
-		glib-sharp
-		glib-sharp2
-		glitz
-		gmime
-		gnet
-		gnome2-SuSE
-		gnome2-user-docs
-		gnome-applets
-		gnome-audio
-		gnome-backgrounds
-		gnome-blog
-		gnome-bluetooth
-		gnome-cups-manager
-		gnome-desktop
-		gnome-doc-utils
-		gnome-filesystem
-		gnome-games
-		gnome-icon-theme
-		gnome-keyring
-		gnome-keyring-manager
-		gnome-mag
-		gnome-media
-		gnomemeeting
-		gnome-menus
-		gnome-mime-data
-		gnome-netstatus
-		gnome-nettool
-		gnome-panel
-		gnome-pilot
-		gnome-power-manager
-		gnome-printer-add
-		gnome-screensaver
-		gnome-session
-		gnome-sharp
-		gnome-sharp2
-		gnome-speech
-		gnome-spell2
-		gnome-system-monitor
-		gnome-terminal
-		gnome-themes
-		gnome-utils
-		gnome-vfs2
-		gnome-vfs-sharp2
-		gnome-volume-manager
-		gnopernicus
-		gnumeric
-		gnutls
-		goffice
-		gok
-		gpart
-		gpg
-		gpg2
-		gpgme
-		gpm
-		grep
-		groff
-		grub
-		gsf-sharp
-		gstreamer010
-		gstreamer010-plugins-base
-		gstreamer010-plugins-base-oil
-		gstreamer010-plugins-base-visual
-		gstreamer010-plugins-good
-		gtk
-		gtk2
-		gtk2-engines
-		gtk2-themes
-		gtk-engines
-		gtkhtml2
-		gtkhtml-sharp2
-		gtklp
-		gtkmm24
-		gtk-sharp
-		gtk-sharp2
-		gtk-sharp2-gapi
-		gtk-sharp-gapi
-		gtksourceview
-		gtkspell
-		gucharmap
-		guile
-		gzip
-		hal
-		hal-gnome
-		hal-resmgr
-		hdparm
-		hermes
-		hplip
-		hplip-hpijs
-		htdig
-		hwinfo
-		i4l-base
-		i4lfirm
-		i4l-isdnlog
-		id3lib
-		ifnteuro
-		ifplugd
-		ImageMagick
-		ImageMagick-Magick++
-		imlib
-		info
-		info2html
-		initviocons
-		inkscape
-		insserv
-		intlfnts
-		ipod-sharp
-		iproute2
-		iptables
-		iputils
-		isapnp
-		iso-codes
-		iso_ent
-		ispell
-		ispell-american
-		ispell-british
-		jack
-		java-1_4_2-gcj-compat
-		jfsutils
-		joe
-		jpackage-utils
-		kbd
-		kdebase3
-		kdebase3-ksysguardd
-		kdebase3-SuSE
-		kdebindings3-python
-		kdelibs3
-		kdelibs3-doc
-		kernel-default
-		kino
-		kio_slp
-		klogd
-		krb5
-		krb5-client
-		ksymoops
-		ldapcpplib
-		less
-		lftp
-		libacl
-		libao
-		libapparmor
-		libart_lgpl
-		libattr
-		libavc1394
-		libbeagle
-		libbonobo
-		libbonoboui
-		libbtctl
-		libcap
-		libcddb
-		libcdio
-		libcom_err
-		libcroco
-		libdc1394
-		libdrm
-		libdv
-		libdvdnav
-		libdvdread
-		libEMF
-		libevent
-		libexif
-		libgail-gnome
-		libgcc
-		libgcj
-		libgcrypt
-		libgda
-		libgdiplus
-		libgimpprint
-		libglade2
-		libgnome
-		libgnomecanvas
-		libgnomecups
-		libgnomedb
-		libgnomeprint
-		libgnomeprintui
-		libgnomesu
-		libgnomeui
-		libgpg-error
-		libgphoto2
-		libgsf
-		libgsf-gnome
-		libgssapi
-		libgtkhtml
-		libgtop
-		libicu
-		libid3tag
-		libidl
-		libidn
-		libieee1284
-		libiniparser
-		libipoddevice
-		libjasper
-		libjpeg
-		libksba
-		liblcms
-		libmikmod
-		libmng
-		libmusicbrainz
-		libnetpbm
-		libnjb
-		libnl
-		libnotify
-		libnscd
-		libnvtv
-		libogg
-		liboil
-		libopencdk
-		libosip2
-		libpcap
-		libpng
-		libquicktime
-		libraw1394
-		librpcsecgss
-		librsvg
-		libsamplerate
-		libsexy
-		libshout
-		libsigc++2
-		libsmbclient
-		libsndfile
-		libsoup
-		libstdc++
-		libstroke
-		libsvg
-		libsvg-cairo
-		libtheora
-		libtiff
-		libtool
-		libusb
-		libvisual
-		libvorbis
-		libwmf
-		libwnck
-		libxcrypt
-		libxklavier
-		libxml2
-		libxml2-python
-		libxslt
-		liby2util
-		libzio
-		libzypp
-		libzypp-zmd-backend
-		liferea
-		lilo
-		limal
-		limal-bootloader
-		limal-perl
-		linphone
-		linphone-applet
-		linux-atm-lib
-		lirc
-		log4net
-		logrotate
-		loudmouth
-		lsb
-		lsof
-		lua
-		lukemftp
-		lzo
-		m4
-		mailx
-		make
-		man
-		man-pages
-		manufacturer-PPDs
-		master-boot-code
-		mc
-		mdadm
-		mDNSResponder
-		mDNSResponder-lib
-		mergeant
-		Mesa
-		metacity
-		metacity-themes
-		microcode_ctl
-		mingetty
-		mjpegtools
-		mkinitrd
-		mkisofs
-		mktemp
-		module-init-tools
-		mono-core
-		mono-data
-		mono-data-sqlite
-		mono-web
-		MozillaFirefox
-		MozillaFirefox-translations
-		mozilla-nspr
-		mozilla-nss
-		mozilla-xulrunner
-		mtools
-		multisync
-		multisync-backup
-		multisync-evolution
-		multisync-irmc
-		multisync-irmc-bluetooth
-		multisync-ldap
-		multisync-opie
-		multisync-syncml
-		myspell-american
-		myspell-british
-		nano
-		nautilus
-		nautilus-cd-burner
-		nautilus-open-terminal
-		nautilus-sendto
-		nautilus-share
-		ncurses
-		neon
-		netcat
-		netcfg
-		netpbm
-		net-snmp
-		net-tools
-		NetworkManager
-		NetworkManager-gnome
-		nfsidmap
-		nfs-utils
-		notification-daemon
-		novfs-kmp-default
-		nscd
-		ntfsprogs
-		openct
-		OpenEXR
-		openh323
-		openldap2-client
-		openmotif-libs
-		openobex
-		OpenOffice_org
-		OpenOffice_org-gnome
-		opensc
-		openslp
-		opensp
-		openssh
-		openssh-askpass
-		openssl
-		orbit2
-		pam
-		pam_krb5
-		pam-modules
-		pan
-		pango
-		parted
-		patch
-		pax
-		pciutils
-		pcre
-		pcsc-lite
-		perl
-		perl-Bootloader
-		perl-Compress-Zlib
-		perl-Config-Crontab
-		perl-Crypt-SmbHash
-		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-Parse-RecDescent
-		perl-PDA-Pilot
-		perl-PlRPC
-		perl-spamassassin
-		perl-TermReadKey
-		perl-TermReadLine-Gnu
-		perl-TimeDate
-		perl-URI
-		perl-X500-DN
-		perl-XML-LibXML
-		perl-XML-LibXML-Common
-		perl-XML-NamespaceSupport
-		perl-XML-Parser
-		perl-XML-SAX
-		perl-XML-Writer
-		permissions
-		pilot-link
-		pin
-		pinentry
-		planner
-		pmtools
-		poppler
-		poppler-glib
-		popt
-		portmap
-		postfix
-		powersave
-		powersave-libs
-		ppp
-		pptp
-		procinfo
-		procmail
-		procps
-		providers
-		psiconv
-		psmisc
-		pstoedit
-		pwdutils
-		pwlib
-		python
-		python-cairo
-		python-gnome
-		python-gnome-extras
-		python-gtk
-		python-imaging
-		python-numeric
-		python-orbit
-		python-qt
-		python-tk
-		python-xml
-		qscintilla
-		qt3
-		readline
-		recode
-		reiserfs
-		release-notes
-		resapplet
-		resmgr
-		rpm
-		rrdtool
-		rsh
-		rsync
-		rug
-		samba
-		samba-client
-		samba-winbind
-		sane
-		sash
-		sax2
-		sax2-gui
-		sax2-ident
-		sax2-libsax
-		sax2-libsax-perl
-		sax2-tools
-		scpm
-		screen
-		scrollkeeper
-		scsi
-		SDL
-		SDL_image
-		SDL_mixer
-		SDL_net
-		SDL_perl
-		SDL_ttf
-		sed
-		sensors
-		setserial
-		sgml-skel
-		shared-mime-info
-		siga
-		sisctrl
-		skencil
-		slang
-		smpppd
-		sound-juicer
-		sox
-		spamassassin
-		speex
-		sqlite
-		sqlite2
-		src_vipa
-		startup-notification
-		strace
-		sudo
-		supertux
-		suse-build-key
-		SuSEfirewall2
-		susehelp
-		susehelp_en
-		suselinux-manual_en
-		suseRegister
-		suse-release
-		suspend
-		sysconfig
-		sysfsutils
-		syslinux
-		syslog-ng
-		sysvinit
-		taglib
-		tango-icon-theme
-		tar
-		tcl
-		tcpd
-		tcsh
-		telnet
-		terminfo
-		testgart
-		thinkeramik-style
-		tightvnc
-		timezone
-		tiny-nvidia-installer
-		tix
-		tk
-		tomboy
-		totem
-		tree
-		udev
-		unclutter
-		unix2dos
-		unixODBC
-		unrar
-		unzip
-		update-alternatives
-		usbutils
-		utempter
-		util-linux
-		v4l-conf
-		vacation
-		vcdimager
-		vim
-		vte
-		w3m
-		wbxml2
-		wdiff
-		wget
-		WindowMaker
-		WindowMaker-applets
-		WindowMaker-themes
-		wireless-tools
-		words
-		wpa_supplicant
-		wv
-		wvdial
-		wvstreams
-		x11-input-gunze
-		x11-input-synaptics
-		x11-input-wacom
-		x11-tools
-		xdelta
-		xdg-menu
-		xdmbgrd
-		xfsprogs
-		xine-lib
-		xinetd
-		xkeyboard-config
-		xli
-		xlockmore
-		xmlcharent
-		xmms-lib
-		xmoto
-		xmset
-		xntp
-		xorg-x11
-		xorg-x11-driver-video
-		xorg-x11-driver-video-nvidia
-		xorg-x11-fonts-100dpi
-		xorg-x11-fonts-75dpi
-		xorg-x11-fonts-scalable
-		xorg-x11-libs
-		xorg-x11-server
-		xorg-x11-server-glx
-		xorg-x11-Xnest
-		xorg-x11-Xvnc
-		xpdf
-		xpdf-tools
-		xsane
-		xscreensaver
-		xterm
-		xtermset
-		yast2
-		yast2-apparmor
-		yast2-backup
-		yast2-bluetooth
-		yast2-bootfloppy
-		yast2-bootloader
-		yast2-control-center
-		yast2-core
-		yast2-country
-		yast2-dhcp-server
-		yast2-dns-server
-		yast2-firewall
-		yast2-hardware-detection
-		yast2-http-server
-		yast2-inetd
-		yast2-installation
-		yast2-irda
-		yast2-kerberos-client
-		yast2-ldap
-		yast2-ldap-client
-		yast2-mail
-		yast2-mail-aliases
-		yast2-mouse
-		yast2-ncurses
-		yast2-network
-		yast2-nfs-client
-		yast2-nfs-server
-		yast2-nis-client
-		yast2-nis-server
-		yast2-ntp-client
-		yast2-online-update
-		yast2-online-update-frontend
-		yast2-packager
-		yast2-pam
-		yast2-perl-bindings
-		yast2-phone-services
-		yast2-pkg-bindings
-		yast2-power-management
-		yast2-powertweak
-		yast2-printer
-		yast2-profile-manager
-		yast2-qt
-		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-lib
-		yast2-support
-		yast2-sysconfig
-		yast2-tftp-server
-		yast2-theme-SuSELinux
-		yast2-trans-de
-		yast2-transfer
-		yast2-trans-stats
-		yast2-tune
-		yast2-tv
-		yast2-update
-		yast2-users
-		yast2-vm
-		yast2-x11
-		yast2-xml
-		yelp
-		ypbind
-		yp-tools
-		zenity
-		zen-updater
-		zip
-		ziptool
-		zisofs-tools
-		zlib
-		zmd
-		zsh
-		zvbi
-	END
+    base = minimal
+    packages = <<END
+        3ddiag
+        855resolution
+        a2ps
+        aaa_base
+        aaa_skel
+        aalib
+        acl
+        acpid
+        alsa
+        alsa-firmware
+        alsa-tools
+        apparmor-docs
+        apparmor-parser
+        apparmor-profiles
+        apparmor-utils
+        arts
+        art-sharp
+        art-sharp2
+        ash
+        aspell
+        aspell-en
+        at
+        atk
+        at-spi
+        attr
+        audiofile
+        audit
+        audit-libs
+        autofs
+        autoyast2
+        autoyast2-installation
+        awesfx
+        banshee
+        banshee-engine-gst
+        banshee-plugins-DAAP
+        bash
+        bc
+        beagle
+        beagle-evolution
+        beagle-firefox
+        beagle-gui
+        beagle-index
+        bind-libs
+        bind-utils
+        binutils
+        bitstream-vera
+        blam
+        blocxx
+        blt
+        bluez-libs
+        bluez-utils
+        boost
+        bootsplash
+        bootsplash-theme-SuSE
+        bug-buddy
+        busybox
+        bzip2
+        cabextract
+        cairo
+        capi4linux
+        cdparanoia
+        cdrdao
+        cdrecord
+        CheckHardware
+        checkmedia
+        cifs-mount
+        compat
+        compat-curl2
+        compat-libstdc++
+        compat-openssl097g
+        contact-lookup-applet
+        control-center2
+        convmv
+        coreutils
+        cpio
+        cpp
+        cpufrequtils
+        cracklib
+        cron
+        Crystalcursors
+        cups
+        cups-client
+        cups-drivers
+        cups-drivers-stp
+        cups-libs
+        cups-SUSE-ppds-dat
+        curl
+        cyrus-sasl
+        cyrus-sasl-saslauthd
+        dasher
+        db
+        dbus-1
+        dbus-1-glib
+        dbus-1-gtk
+        dbus-1-mono
+        dbus-1-python
+        dbus-1-qt3
+        dbus-1-x11
+        dcraw
+        dejavu
+        deltarpm
+        desktop-data-SuSE
+        desktop-file-utils
+        desktop-translations
+        device-mapper
+        devs
+        dhcdbd
+        dhcp
+        dhcpcd
+        dhcp-client
+        dia
+        dialog
+        diffutils
+        DirectFB
+        dirmngr
+        dmraid
+        docbook_4
+        dos2unix
+        dosbootdisk
+        dosfstools
+        dvd+rw-tools
+        e2fsprogs
+        ed
+        eel
+        efont-unicode
+        eject
+        enigma
+        eog
+        epiphany
+        epiphany-extensions
+        esound
+        ethtool
+        evince
+        evolution
+        evolution-data-server
+        evolution-exchange
+        evolution-pilot
+        evolution-sharp
+        evolution-webcal
+        expat
+        fam
+        fam-server
+        fbset
+        festival
+        file
+        file-roller
+        fileshareset
+        filesystem
+        fillup
+        filters
+        findutils
+        finger
+        flac
+        fontconfig
+        fonts-config
+        foomatic-filters
+        freeciv
+        freeglut
+        freetype
+        freetype2
+        fribidi
+        frozen-bubble
+        f-spot
+        fvwm2
+        gail
+        gaim
+        gal2
+        gawk
+        gcalctool
+        gconf2
+        gconf-editor
+        gconf-sharp
+        gconf-sharp2
+        gdb
+        gdbm
+        gdk-pixbuf
+        gdm
+        gecko-sharp
+        gecko-sharp2
+        gedit
+        gettext
+        ghex
+        ghostscript-fonts-other
+        ghostscript-fonts-std
+        ghostscript-library
+        ghostscript-x11
+        giflib
+        gimp
+        gimp-cmyk
+        gimp-help
+        glade-sharp
+        glade-sharp2
+        gle
+        glib
+        glib2
+        glibc
+        glibc-i18ndata
+        glibc-locale
+        glibmm24
+        glib-sharp
+        glib-sharp2
+        glitz
+        gmime
+        gnet
+        gnome2-SuSE
+        gnome2-user-docs
+        gnome-applets
+        gnome-audio
+        gnome-backgrounds
+        gnome-blog
+        gnome-bluetooth
+        gnome-cups-manager
+        gnome-desktop
+        gnome-doc-utils
+        gnome-filesystem
+        gnome-games
+        gnome-icon-theme
+        gnome-keyring
+        gnome-keyring-manager
+        gnome-mag
+        gnome-media
+        gnomemeeting
+        gnome-menus
+        gnome-mime-data
+        gnome-netstatus
+        gnome-nettool
+        gnome-panel
+        gnome-pilot
+        gnome-power-manager
+        gnome-printer-add
+        gnome-screensaver
+        gnome-session
+        gnome-sharp
+        gnome-sharp2
+        gnome-speech
+        gnome-spell2
+        gnome-system-monitor
+        gnome-terminal
+        gnome-themes
+        gnome-utils
+        gnome-vfs2
+        gnome-vfs-sharp2
+        gnome-volume-manager
+        gnopernicus
+        gnumeric
+        gnutls
+        goffice
+        gok
+        gpart
+        gpg
+        gpg2
+        gpgme
+        gpm
+        grep
+        groff
+        grub
+        gsf-sharp
+        gstreamer010
+        gstreamer010-plugins-base
+        gstreamer010-plugins-base-oil
+        gstreamer010-plugins-base-visual
+        gstreamer010-plugins-good
+        gtk
+        gtk2
+        gtk2-engines
+        gtk2-themes
+        gtk-engines
+        gtkhtml2
+        gtkhtml-sharp2
+        gtklp
+        gtkmm24
+        gtk-sharp
+        gtk-sharp2
+        gtk-sharp2-gapi
+        gtk-sharp-gapi
+        gtksourceview
+        gtkspell
+        gucharmap
+        guile
+        gzip
+        hal
+        hal-gnome
+        hal-resmgr
+        hdparm
+        hermes
+        hplip
+        hplip-hpijs
+        htdig
+        hwinfo
+        i4l-base
+        i4lfirm
+        i4l-isdnlog
+        id3lib
+        ifnteuro
+        ifplugd
+        ImageMagick
+        ImageMagick-Magick++
+        imlib
+        info
+        info2html
+        initviocons
+        inkscape
+        insserv
+        intlfnts
+        ipod-sharp
+        iproute2
+        iptables
+        iputils
+        isapnp
+        iso-codes
+        iso_ent
+        ispell
+        ispell-american
+        ispell-british
+        jack
+        java-1_4_2-gcj-compat
+        jfsutils
+        joe
+        jpackage-utils
+        kbd
+        kdebase3
+        kdebase3-ksysguardd
+        kdebase3-SuSE
+        kdebindings3-python
+        kdelibs3
+        kdelibs3-doc
+        kernel-default
+        kino
+        kio_slp
+        klogd
+        krb5
+        krb5-client
+        ksymoops
+        ldapcpplib
+        less
+        lftp
+        libacl
+        libao
+        libapparmor
+        libart_lgpl
+        libattr
+        libavc1394
+        libbeagle
+        libbonobo
+        libbonoboui
+        libbtctl
+        libcap
+        libcddb
+        libcdio
+        libcom_err
+        libcroco
+        libdc1394
+        libdrm
+        libdv
+        libdvdnav
+        libdvdread
+        libEMF
+        libevent
+        libexif
+        libgail-gnome
+        libgcc
+        libgcj
+        libgcrypt
+        libgda
+        libgdiplus
+        libgimpprint
+        libglade2
+        libgnome
+        libgnomecanvas
+        libgnomecups
+        libgnomedb
+        libgnomeprint
+        libgnomeprintui
+        libgnomesu
+        libgnomeui
+        libgpg-error
+        libgphoto2
+        libgsf
+        libgsf-gnome
+        libgssapi
+        libgtkhtml
+        libgtop
+        libicu
+        libid3tag
+        libidl
+        libidn
+        libieee1284
+        libiniparser
+        libipoddevice
+        libjasper
+        libjpeg
+        libksba
+        liblcms
+        libmikmod
+        libmng
+        libmusicbrainz
+        libnetpbm
+        libnjb
+        libnl
+        libnotify
+        libnscd
+        libnvtv
+        libogg
+        liboil
+        libopencdk
+        libosip2
+        libpcap
+        libpng
+        libquicktime
+        libraw1394
+        librpcsecgss
+        librsvg
+        libsamplerate
+        libsexy
+        libshout
+        libsigc++2
+        libsmbclient
+        libsndfile
+        libsoup
+        libstdc++
+        libstroke
+        libsvg
+        libsvg-cairo
+        libtheora
+        libtiff
+        libtool
+        libusb
+        libvisual
+        libvorbis
+        libwmf
+        libwnck
+        libxcrypt
+        libxklavier
+        libxml2
+        libxml2-python
+        libxslt
+        liby2util
+        libzio
+        libzypp
+        libzypp-zmd-backend
+        liferea
+        lilo
+        limal
+        limal-bootloader
+        limal-perl
+        linphone
+        linphone-applet
+        linux-atm-lib
+        lirc
+        log4net
+        logrotate
+        loudmouth
+        lsb
+        lsof
+        lua
+        lukemftp
+        lzo
+        m4
+        mailx
+        make
+        man
+        man-pages
+        manufacturer-PPDs
+        master-boot-code
+        mc
+        mdadm
+        mDNSResponder
+        mDNSResponder-lib
+        mergeant
+        Mesa
+        metacity
+        metacity-themes
+        microcode_ctl
+        mingetty
+        mjpegtools
+        mkinitrd
+        mkisofs
+        mktemp
+        module-init-tools
+        mono-core
+        mono-data
+        mono-data-sqlite
+        mono-web
+        MozillaFirefox
+        MozillaFirefox-translations
+        mozilla-nspr
+        mozilla-nss
+        mozilla-xulrunner
+        mtools
+        multisync
+        multisync-backup
+        multisync-evolution
+        multisync-irmc
+        multisync-irmc-bluetooth
+        multisync-ldap
+        multisync-opie
+        multisync-syncml
+        myspell-american
+        myspell-british
+        nano
+        nautilus
+        nautilus-cd-burner
+        nautilus-open-terminal
+        nautilus-sendto
+        nautilus-share
+        ncurses
+        neon
+        netcat
+        netcfg
+        netpbm
+        net-snmp
+        net-tools
+        NetworkManager
+        NetworkManager-gnome
+        nfsidmap
+        nfs-utils
+        notification-daemon
+        novfs-kmp-default
+        nscd
+        ntfsprogs
+        openct
+        OpenEXR
+        openh323
+        openldap2-client
+        openmotif-libs
+        openobex
+        OpenOffice_org
+        OpenOffice_org-gnome
+        opensc
+        openslp
+        opensp
+        openssh
+        openssh-askpass
+        openssl
+        orbit2
+        pam
+        pam_krb5
+        pam-modules
+        pan
+        pango
+        parted
+        patch
+        pax
+        pciutils
+        pcre
+        pcsc-lite
+        perl
+        perl-Bootloader
+        perl-Compress-Zlib
+        perl-Config-Crontab
+        perl-Crypt-SmbHash
+        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-Parse-RecDescent
+        perl-PDA-Pilot
+        perl-PlRPC
+        perl-spamassassin
+        perl-TermReadKey
+        perl-TermReadLine-Gnu
+        perl-TimeDate
+        perl-URI
+        perl-X500-DN
+        perl-XML-LibXML
+        perl-XML-LibXML-Common
+        perl-XML-NamespaceSupport
+        perl-XML-Parser
+        perl-XML-SAX
+        perl-XML-Writer
+        permissions
+        pilot-link
+        pin
+        pinentry
+        planner
+        pmtools
+        poppler
+        poppler-glib
+        popt
+        portmap
+        postfix
+        powersave
+        powersave-libs
+        ppp
+        pptp
+        procinfo
+        procmail
+        procps
+        providers
+        psiconv
+        psmisc
+        pstoedit
+        pwdutils
+        pwlib
+        python
+        python-cairo
+        python-gnome
+        python-gnome-extras
+        python-gtk
+        python-imaging
+        python-numeric
+        python-orbit
+        python-qt
+        python-tk
+        python-xml
+        qscintilla
+        qt3
+        readline
+        recode
+        reiserfs
+        release-notes
+        resapplet
+        resmgr
+        rpm
+        rrdtool
+        rsh
+        rsync
+        rug
+        samba
+        samba-client
+        samba-winbind
+        sane
+        sash
+        sax2
+        sax2-gui
+        sax2-ident
+        sax2-libsax
+        sax2-libsax-perl
+        sax2-tools
+        scpm
+        screen
+        scrollkeeper
+        scsi
+        SDL
+        SDL_image
+        SDL_mixer
+        SDL_net
+        SDL_perl
+        SDL_ttf
+        sed
+        sensors
+        setserial
+        sgml-skel
+        shared-mime-info
+        siga
+        sisctrl
+        skencil
+        slang
+        smpppd
+        sound-juicer
+        sox
+        spamassassin
+        speex
+        sqlite
+        sqlite2
+        src_vipa
+        startup-notification
+        strace
+        sudo
+        supertux
+        suse-build-key
+        SuSEfirewall2
+        susehelp
+        susehelp_en
+        suselinux-manual_en
+        suseRegister
+        suse-release
+        suspend
+        sysconfig
+        sysfsutils
+        syslinux
+        syslog-ng
+        sysvinit
+        taglib
+        tango-icon-theme
+        tar
+        tcl
+        tcpd
+        tcsh
+        telnet
+        terminfo
+        testgart
+        thinkeramik-style
+        tightvnc
+        timezone
+        tiny-nvidia-installer
+        tix
+        tk
+        tomboy
+        totem
+        tree
+        udev
+        unclutter
+        unix2dos
+        unixODBC
+        unrar
+        unzip
+        update-alternatives
+        usbutils
+        utempter
+        util-linux
+        v4l-conf
+        vacation
+        vcdimager
+        vim
+        vte
+        w3m
+        wbxml2
+        wdiff
+        wget
+        WindowMaker
+        WindowMaker-applets
+        WindowMaker-themes
+        wireless-tools
+        words
+        wpa_supplicant
+        wv
+        wvdial
+        wvstreams
+        x11-input-gunze
+        x11-input-synaptics
+        x11-input-wacom
+        x11-tools
+        xdelta
+        xdg-menu
+        xdmbgrd
+        xfsprogs
+        xine-lib
+        xinetd
+        xkeyboard-config
+        xli
+        xlockmore
+        xmlcharent
+        xmms-lib
+        xmoto
+        xmset
+        xntp
+        xorg-x11
+        xorg-x11-driver-video
+        xorg-x11-driver-video-nvidia
+        xorg-x11-fonts-100dpi
+        xorg-x11-fonts-75dpi
+        xorg-x11-fonts-scalable
+        xorg-x11-libs
+        xorg-x11-server
+        xorg-x11-server-glx
+        xorg-x11-Xnest
+        xorg-x11-Xvnc
+        xpdf
+        xpdf-tools
+        xsane
+        xscreensaver
+        xterm
+        xtermset
+        yast2
+        yast2-apparmor
+        yast2-backup
+        yast2-bluetooth
+        yast2-bootfloppy
+        yast2-bootloader
+        yast2-control-center
+        yast2-core
+        yast2-country
+        yast2-dhcp-server
+        yast2-dns-server
+        yast2-firewall
+        yast2-hardware-detection
+        yast2-http-server
+        yast2-inetd
+        yast2-installation
+        yast2-irda
+        yast2-kerberos-client
+        yast2-ldap
+        yast2-ldap-client
+        yast2-mail
+        yast2-mail-aliases
+        yast2-mouse
+        yast2-ncurses
+        yast2-network
+        yast2-nfs-client
+        yast2-nfs-server
+        yast2-nis-client
+        yast2-nis-server
+        yast2-ntp-client
+        yast2-online-update
+        yast2-online-update-frontend
+        yast2-packager
+        yast2-pam
+        yast2-perl-bindings
+        yast2-phone-services
+        yast2-pkg-bindings
+        yast2-power-management
+        yast2-powertweak
+        yast2-printer
+        yast2-profile-manager
+        yast2-qt
+        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-lib
+        yast2-support
+        yast2-sysconfig
+        yast2-tftp-server
+        yast2-theme-SuSELinux
+        yast2-trans-de
+        yast2-transfer
+        yast2-trans-stats
+        yast2-tune
+        yast2-tv
+        yast2-update
+        yast2-users
+        yast2-vm
+        yast2-x11
+        yast2-xml
+        yelp
+        ypbind
+        yp-tools
+        zenity
+        zen-updater
+        zip
+        ziptool
+        zisofs-tools
+        zlib
+        zmd
+        zsh
+        zvbi
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/suse-10.1/settings.example b/lib/distro-info/suse-10.1/settings.example
index 2c360086..726b979f 100644
--- a/lib/distro-info/suse-10.1/settings.example
+++ b/lib/distro-info/suse-10.1/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/suse-10.1_x86_64/settings.default b/lib/distro-info/suse-10.1_x86_64/settings.default
index f40ad5ea..27edf02d 100644
--- a/lib/distro-info/suse-10.1_x86_64/settings.default
+++ b/lib/distro-info/suse-10.1_x86_64/settings.default
@@ -1,975 +1,975 @@
 bootstrap-packages = <<END
-	x86_64/aaa_base-10.1-41.x86_64.rpm
-	x86_64/aaa_skel-2006.3.29-5.x86_64.rpm x86_64/aaa_skel-2006.5.19-0.2.x86_64.rpm
-	x86_64/ash-1.6.1-13.x86_64.rpm
-	x86_64/bash-3.1-22.x86_64.rpm x86_64/bash-3.1-24.3.x86_64.rpm
-	x86_64/blocxx-1.0.0-15.x86_64.rpm
-	x86_64/bzip2-1.0.3-15.x86_64.rpm
-	x86_64/coreutils-5.93-20.x86_64.rpm
-	x86_64/cpio-2.6-17.x86_64.rpm
-	x86_64/cracklib-2.8.6-12.x86_64.rpm
-	x86_64/cyrus-sasl-2.1.21-18.x86_64.rpm
-	x86_64/db-4.3.29-13.x86_64.rpm
-	x86_64/diffutils-2.8.7-15.x86_64.rpm
-	x86_64/e2fsprogs-1.38-25.x86_64.rpm
-	x86_64/expat-2.0.0-11.x86_64.rpm
-	x86_64/file-4.16-13.x86_64.rpm x86_64/file-4.16-15.4.x86_64.rpm
-	x86_64/filesystem-10.1-5.x86_64.rpm
-	x86_64/fillup-1.42-116.x86_64.rpm
-	x86_64/findutils-4.2.27-12.x86_64.rpm
-	x86_64/gawk-3.1.5-18.x86_64.rpm
-	x86_64/gdbm-1.8.3-241.x86_64.rpm
-	x86_64/glibc-2.4-25.x86_64.rpm x86_64/glibc-2.4-31.1.x86_64.rpm
-	x86_64/glibc-32bit-2.4-27.x86_64.rpm x86_64/glibc-32bit-2.4-30.x86_64.rpm x86_64/glibc-32bit-2.4-31.1.x86_64.rpm
-	x86_64/gpg-1.4.2-23.x86_64.rpm x86_64/gpg-1.4.2-23.7.x86_64.rpm
-	x86_64/grep-2.5.1a-18.x86_64.rpm
-	x86_64/gzip-1.3.5-157.x86_64.rpm x86_64/gzip-1.3.5-159.5.x86_64.rpm
-	x86_64/info-4.8-20.x86_64.rpm
-	x86_64/insserv-1.04.0-18.x86_64.rpm
-	x86_64/irqbalance-0.09-58.x86_64.rpm
-	x86_64/kernel-default-2.6.16.13-4.x86_64.rpm x86_64/kernel-default-2.6.16.21-0.25.x86_64.rpm
-	x86_64/libacl-2.2.34-12.x86_64.rpm
-	x86_64/libattr-2.4.28-14.x86_64.rpm
-	x86_64/libcom_err-1.38-25.x86_64.rpm
-	x86_64/libgcc-4.1.0-25.x86_64.rpm
-	x86_64/libstdc++-4.1.0-25.x86_64.rpm
-	x86_64/libxcrypt-2.4-10.x86_64.rpm
-	x86_64/libzio-0.1-15.x86_64.rpm
-	x86_64/limal-1.1.6-8.x86_64.rpm
-	x86_64/limal-bootloader-1.1.2-7.x86_64.rpm
-	x86_64/limal-perl-1.1.6-8.x86_64.rpm
-	x86_64/logrotate-3.7.3-11.x86_64.rpm
-	x86_64/mdadm-2.2-30.x86_64.rpm
-	x86_64/mingetty-0.9.6s-86.x86_64.rpm
-	x86_64/mkinitrd-1.2-103.x86_64.rpm x86_64/mkinitrd-1.2-106.19.x86_64.rpm
-	x86_64/mktemp-1.5-742.x86_64.rpm
-	x86_64/module-init-tools-3.2.2-32.x86_64.rpm x86_64/module-init-tools-3.2.2-32.13.x86_64.rpm
-	x86_64/ncurses-5.5-16.x86_64.rpm
-	x86_64/net-tools-1.60-581.x86_64.rpm
-	x86_64/openldap2-client-2.3.19-18.x86_64.rpm
-	x86_64/openssl-0.9.8a-16.x86_64.rpm x86_64/openssl-0.9.8a-18.10.x86_64.rpm
-	x86_64/pam-0.99.3.0-25.x86_64.rpm x86_64/pam-0.99.3.0-29.3.x86_64.rpm
-	x86_64/pciutils-2.2.1-14.x86_64.rpm
-	x86_64/pcre-6.4-12.x86_64.rpm
-	x86_64/perl-5.8.8-12.x86_64.rpm
-	x86_64/perl-Bootloader-0.2.20-7.x86_64.rpm x86_64/perl-Bootloader-0.2.27-0.4.x86_64.rpm
-	x86_64/perl-gettext-1.05-11.x86_64.rpm
-	x86_64/permissions-2006.2.24-8.x86_64.rpm
-	x86_64/popt-1.7-268.x86_64.rpm
-	x86_64/readline-5.1-22.x86_64.rpm
-	x86_64/reiserfs-3.6.19-17.x86_64.rpm
-	x86_64/rpm-4.4.2-40.x86_64.rpm x86_64/rpm-4.4.2-43.4.x86_64.rpm
-	x86_64/sed-4.1.4-15.x86_64.rpm
-	x86_64/suse-release-10.1-9.x86_64.rpm
-	x86_64/sysvinit-2.86-19.x86_64.rpm
-	x86_64/udev-085-29.x86_64.rpm x86_64/udev-085-30.15.x86_64.rpm
-	x86_64/util-linux-2.12r-35.x86_64.rpm
-	x86_64/zlib-1.2.3-13.x86_64.rpm
-	noarch/suse-build-key-1.0-685.noarch.rpm
+    x86_64/aaa_base-10.1-41.x86_64.rpm
+    x86_64/aaa_skel-2006.3.29-5.x86_64.rpm x86_64/aaa_skel-2006.5.19-0.2.x86_64.rpm
+    x86_64/ash-1.6.1-13.x86_64.rpm
+    x86_64/bash-3.1-22.x86_64.rpm x86_64/bash-3.1-24.3.x86_64.rpm
+    x86_64/blocxx-1.0.0-15.x86_64.rpm
+    x86_64/bzip2-1.0.3-15.x86_64.rpm
+    x86_64/coreutils-5.93-20.x86_64.rpm
+    x86_64/cpio-2.6-17.x86_64.rpm
+    x86_64/cracklib-2.8.6-12.x86_64.rpm
+    x86_64/cyrus-sasl-2.1.21-18.x86_64.rpm
+    x86_64/db-4.3.29-13.x86_64.rpm
+    x86_64/diffutils-2.8.7-15.x86_64.rpm
+    x86_64/e2fsprogs-1.38-25.x86_64.rpm
+    x86_64/expat-2.0.0-11.x86_64.rpm
+    x86_64/file-4.16-13.x86_64.rpm x86_64/file-4.16-15.4.x86_64.rpm
+    x86_64/filesystem-10.1-5.x86_64.rpm
+    x86_64/fillup-1.42-116.x86_64.rpm
+    x86_64/findutils-4.2.27-12.x86_64.rpm
+    x86_64/gawk-3.1.5-18.x86_64.rpm
+    x86_64/gdbm-1.8.3-241.x86_64.rpm
+    x86_64/glibc-2.4-25.x86_64.rpm x86_64/glibc-2.4-31.1.x86_64.rpm
+    x86_64/glibc-32bit-2.4-27.x86_64.rpm x86_64/glibc-32bit-2.4-30.x86_64.rpm x86_64/glibc-32bit-2.4-31.1.x86_64.rpm
+    x86_64/gpg-1.4.2-23.x86_64.rpm x86_64/gpg-1.4.2-23.7.x86_64.rpm
+    x86_64/grep-2.5.1a-18.x86_64.rpm
+    x86_64/gzip-1.3.5-157.x86_64.rpm x86_64/gzip-1.3.5-159.5.x86_64.rpm
+    x86_64/info-4.8-20.x86_64.rpm
+    x86_64/insserv-1.04.0-18.x86_64.rpm
+    x86_64/irqbalance-0.09-58.x86_64.rpm
+    x86_64/kernel-default-2.6.16.13-4.x86_64.rpm x86_64/kernel-default-2.6.16.21-0.25.x86_64.rpm
+    x86_64/libacl-2.2.34-12.x86_64.rpm
+    x86_64/libattr-2.4.28-14.x86_64.rpm
+    x86_64/libcom_err-1.38-25.x86_64.rpm
+    x86_64/libgcc-4.1.0-25.x86_64.rpm
+    x86_64/libstdc++-4.1.0-25.x86_64.rpm
+    x86_64/libxcrypt-2.4-10.x86_64.rpm
+    x86_64/libzio-0.1-15.x86_64.rpm
+    x86_64/limal-1.1.6-8.x86_64.rpm
+    x86_64/limal-bootloader-1.1.2-7.x86_64.rpm
+    x86_64/limal-perl-1.1.6-8.x86_64.rpm
+    x86_64/logrotate-3.7.3-11.x86_64.rpm
+    x86_64/mdadm-2.2-30.x86_64.rpm
+    x86_64/mingetty-0.9.6s-86.x86_64.rpm
+    x86_64/mkinitrd-1.2-103.x86_64.rpm x86_64/mkinitrd-1.2-106.19.x86_64.rpm
+    x86_64/mktemp-1.5-742.x86_64.rpm
+    x86_64/module-init-tools-3.2.2-32.x86_64.rpm x86_64/module-init-tools-3.2.2-32.13.x86_64.rpm
+    x86_64/ncurses-5.5-16.x86_64.rpm
+    x86_64/net-tools-1.60-581.x86_64.rpm
+    x86_64/openldap2-client-2.3.19-18.x86_64.rpm
+    x86_64/openssl-0.9.8a-16.x86_64.rpm x86_64/openssl-0.9.8a-18.10.x86_64.rpm
+    x86_64/pam-0.99.3.0-25.x86_64.rpm x86_64/pam-0.99.3.0-29.3.x86_64.rpm
+    x86_64/pciutils-2.2.1-14.x86_64.rpm
+    x86_64/pcre-6.4-12.x86_64.rpm
+    x86_64/perl-5.8.8-12.x86_64.rpm
+    x86_64/perl-Bootloader-0.2.20-7.x86_64.rpm x86_64/perl-Bootloader-0.2.27-0.4.x86_64.rpm
+    x86_64/perl-gettext-1.05-11.x86_64.rpm
+    x86_64/permissions-2006.2.24-8.x86_64.rpm
+    x86_64/popt-1.7-268.x86_64.rpm
+    x86_64/readline-5.1-22.x86_64.rpm
+    x86_64/reiserfs-3.6.19-17.x86_64.rpm
+    x86_64/rpm-4.4.2-40.x86_64.rpm x86_64/rpm-4.4.2-43.4.x86_64.rpm
+    x86_64/sed-4.1.4-15.x86_64.rpm
+    x86_64/suse-release-10.1-9.x86_64.rpm
+    x86_64/sysvinit-2.86-19.x86_64.rpm
+    x86_64/udev-085-29.x86_64.rpm x86_64/udev-085-30.15.x86_64.rpm
+    x86_64/util-linux-2.12r-35.x86_64.rpm
+    x86_64/zlib-1.2.3-13.x86_64.rpm
+    noarch/suse-build-key-1.0-685.noarch.rpm
 END
 <metapackager smart>
-	packages = <<END
-		x86_64/python-2.4.2-18.x86_64.rpm
-		x86_64/python-elementtree-1.2.6-18.x86_64.rpm
-		x86_64/python-xml-2.4.2-18.x86_64.rpm
-		x86_64/rpm-python-4.4.2-40.x86_64.rpm
-		x86_64/smart-0.41-23.x86_64.rpm
-	END
+    packages = <<END
+        x86_64/python-2.4.2-18.x86_64.rpm
+        x86_64/python-elementtree-1.2.6-18.x86_64.rpm
+        x86_64/python-xml-2.4.2-18.x86_64.rpm
+        x86_64/rpm-python-4.4.2-40.x86_64.rpm
+        x86_64/smart-0.41-23.x86_64.rpm
+    END
 </metapackager>
 <metapackager yum>
-	packages = <<END
-		x86_64/libxml2-2.6.23-13.x86_64.rpm
-		x86_64/libxml2-python-2.6.23-15.x86_64.rpm
-		x86_64/python-2.4.2-18.x86_64.rpm
-		x86_64/python-elementtree-1.2.6-18.x86_64.rpm
-		x86_64/python-sqlite-1.1.6-17.x86_64.rpm
-		x86_64/python-urlgrabber-2.9.7-15.x86_64.rpm
-		x86_64/rpm-python-4.4.2-40.x86_64.rpm
-		x86_64/sqlite-3.2.8-14.x86_64.rpm
-		x86_64/yum-2.4.2-13.x86_64.rpm
-	END
+    packages = <<END
+        x86_64/libxml2-2.6.23-13.x86_64.rpm
+        x86_64/libxml2-python-2.6.23-15.x86_64.rpm
+        x86_64/python-2.4.2-18.x86_64.rpm
+        x86_64/python-elementtree-1.2.6-18.x86_64.rpm
+        x86_64/python-sqlite-1.1.6-17.x86_64.rpm
+        x86_64/python-urlgrabber-2.9.7-15.x86_64.rpm
+        x86_64/rpm-python-4.4.2-40.x86_64.rpm
+        x86_64/sqlite-3.2.8-14.x86_64.rpm
+        x86_64/yum-2.4.2-13.x86_64.rpm
+    END
 </metapackager>
 package-subdir = suse
 prereq-packages = <<END
-	x86_64/bzip2-1.0.3-15.x86_64.rpm
-	x86_64/glibc-2.4-25.x86_64.rpm x86_64/glibc-2.4-31.1.x86_64.rpm
-	x86_64/popt-1.7-268.x86_64.rpm
-	x86_64/rpm-4.4.2-40.x86_64.rpm x86_64/rpm-4.4.2-43.4.x86_64.rpm
-	x86_64/zlib-1.2.3-13.x86_64.rpm
+    x86_64/bzip2-1.0.3-15.x86_64.rpm
+    x86_64/glibc-2.4-25.x86_64.rpm x86_64/glibc-2.4-31.1.x86_64.rpm
+    x86_64/popt-1.7-268.x86_64.rpm
+    x86_64/rpm-4.4.2-40.x86_64.rpm x86_64/rpm-4.4.2-43.4.x86_64.rpm
+    x86_64/zlib-1.2.3-13.x86_64.rpm
 END
 <repository base>
-	name = SUSE Linux 10.1
-	repo-subdir = suse
-	file-for-speedtest = suse/setup/descr/packages.en
+    name = SUSE Linux 10.1
+    repo-subdir = suse
+    file-for-speedtest = suse/setup/descr/packages.en
 </repository>
 <repository base_non-oss>
-	name = SUSE Linux 10.1 non-OSS
-	repo-subdir = suse
-	file-for-speedtest = suse/setup/descr/packages.en
+    name = SUSE Linux 10.1 non-OSS
+    repo-subdir = suse
+    file-for-speedtest = suse/setup/descr/packages.en
 </repository>
 <repository base_update>
-	name = SUSE Linux 10.1 updates
-	file-for-speedtest = repodata/primary.xml.gz
+    name = SUSE Linux 10.1 updates
+    file-for-speedtest = repodata/primary.xml.gz
 </repository>
 <selection minimal>
-	packages = <<END
-		glibc-locale
-	END
+    packages = <<END
+        glibc-locale
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-	END
+    base = minimal
+    packages = <<END
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		3ddiag
-		855resolution
-		a2ps
-		aaa_base
-		aaa_skel
-		aalib
-		acl
-		acpid
-		alsa
-		alsa-firmware
-		alsa-tools
-		apparmor-docs
-		apparmor-parser
-		apparmor-profiles
-		apparmor-utils
-		arts
-		art-sharp
-		art-sharp2
-		ash
-		aspell
-		aspell-en
-		at
-		atk
-		at-spi
-		attr
-		audiofile
-		audit
-		audit-libs
-		autofs
-		autoyast2
-		autoyast2-installation
-		awesfx
-		banshee
-		banshee-engine-gst
-		banshee-plugins-DAAP
-		bash
-		bc
-		beagle
-		beagle-evolution
-		beagle-firefox
-		beagle-gui
-		beagle-index
-		bind-libs
-		bind-utils
-		binutils
-		bitstream-vera
-		blam
-		blocxx
-		blt
-		bluez-libs
-		bluez-utils
-		boost
-		bootsplash
-		bootsplash-theme-SuSE
-		bug-buddy
-		busybox
-		bzip2
-		cabextract
-		cairo
-		capi4linux
-		cdparanoia
-		cdrdao
-		cdrecord
-		CheckHardware
-		checkmedia
-		cifs-mount
-		compat
-		compat-curl2
-		compat-libstdc++
-		compat-openssl097g
-		contact-lookup-applet
-		control-center2
-		convmv
-		coreutils
-		cpio
-		cpp
-		cpufrequtils
-		cracklib
-		cron
-		Crystalcursors
-		cups
-		cups-client
-		cups-drivers
-		cups-drivers-stp
-		cups-libs
-		cups-SUSE-ppds-dat
-		curl
-		cyrus-sasl
-		cyrus-sasl-saslauthd
-		dasher
-		db
-		dbus-1
-		dbus-1-glib
-		dbus-1-gtk
-		dbus-1-mono
-		dbus-1-python
-		dbus-1-qt3
-		dbus-1-x11
-		dcraw
-		dejavu
-		deltarpm
-		desktop-data-SuSE
-		desktop-file-utils
-		desktop-translations
-		device-mapper
-		devs
-		dhcdbd
-		dhcp
-		dhcpcd
-		dhcp-client
-		dia
-		dialog
-		diffutils
-		DirectFB
-		dirmngr
-		dmraid
-		docbook_4
-		dos2unix
-		dosbootdisk
-		dosfstools
-		dvd+rw-tools
-		e2fsprogs
-		ed
-		eel
-		efont-unicode
-		eject
-		enigma
-		eog
-		epiphany
-		epiphany-extensions
-		esound
-		ethtool
-		evince
-		evolution
-		evolution-data-server
-		evolution-exchange
-		evolution-pilot
-		evolution-sharp
-		evolution-webcal
-		expat
-		fam
-		fam-server
-		fbset
-		festival
-		file
-		file-roller
-		fileshareset
-		filesystem
-		fillup
-		filters
-		findutils
-		finger
-		flac
-		fontconfig
-		fonts-config
-		foomatic-filters
-		freeciv
-		freeglut
-		freetype
-		freetype2
-		fribidi
-		frozen-bubble
-		f-spot
-		fvwm2
-		gail
-		gaim
-		gal2
-		gawk
-		gcalctool
-		gconf2
-		gconf-editor
-		gconf-sharp
-		gconf-sharp2
-		gdb
-		gdbm
-		gdk-pixbuf
-		gdm
-		gecko-sharp
-		gecko-sharp2
-		gedit
-		gettext
-		ghex
-		ghostscript-fonts-other
-		ghostscript-fonts-std
-		ghostscript-library
-		ghostscript-x11
-		giflib
-		gimp
-		gimp-cmyk
-		gimp-help
-		glade-sharp
-		glade-sharp2
-		gle
-		glib
-		glib2
-		glibc
-		glibc-i18ndata
-		glibc-locale
-		glibmm24
-		glib-sharp
-		glib-sharp2
-		glitz
-		gmime
-		gnet
-		gnome2-SuSE
-		gnome2-user-docs
-		gnome-applets
-		gnome-audio
-		gnome-backgrounds
-		gnome-blog
-		gnome-bluetooth
-		gnome-cups-manager
-		gnome-desktop
-		gnome-doc-utils
-		gnome-filesystem
-		gnome-games
-		gnome-icon-theme
-		gnome-keyring
-		gnome-keyring-manager
-		gnome-mag
-		gnome-media
-		gnomemeeting
-		gnome-menus
-		gnome-mime-data
-		gnome-netstatus
-		gnome-nettool
-		gnome-panel
-		gnome-pilot
-		gnome-power-manager
-		gnome-printer-add
-		gnome-screensaver
-		gnome-session
-		gnome-sharp
-		gnome-sharp2
-		gnome-speech
-		gnome-spell2
-		gnome-system-monitor
-		gnome-terminal
-		gnome-themes
-		gnome-utils
-		gnome-vfs2
-		gnome-vfs-sharp2
-		gnome-volume-manager
-		gnopernicus
-		gnumeric
-		gnutls
-		goffice
-		gok
-		gpart
-		gpg
-		gpg2
-		gpgme
-		gpm
-		grep
-		groff
-		grub
-		gsf-sharp
-		gstreamer010
-		gstreamer010-plugins-base
-		gstreamer010-plugins-base-oil
-		gstreamer010-plugins-base-visual
-		gstreamer010-plugins-good
-		gtk
-		gtk2
-		gtk2-engines
-		gtk2-themes
-		gtk-engines
-		gtkhtml2
-		gtkhtml-sharp2
-		gtklp
-		gtkmm24
-		gtk-sharp
-		gtk-sharp2
-		gtk-sharp2-gapi
-		gtk-sharp-gapi
-		gtksourceview
-		gtkspell
-		gucharmap
-		guile
-		gzip
-		hal
-		hal-gnome
-		hal-resmgr
-		hdparm
-		hermes
-		hplip
-		hplip-hpijs
-		htdig
-		hwinfo
-		i4l-base
-		i4lfirm
-		i4l-isdnlog
-		id3lib
-		ifnteuro
-		ifplugd
-		ImageMagick
-		ImageMagick-Magick++
-		imlib
-		info
-		info2html
-		initviocons
-		inkscape
-		insserv
-		intlfnts
-		ipod-sharp
-		iproute2
-		iptables
-		iputils
-		isapnp
-		iso-codes
-		iso_ent
-		ispell
-		ispell-american
-		ispell-british
-		jack
-		java-1_4_2-gcj-compat
-		jfsutils
-		joe
-		jpackage-utils
-		kbd
-		kdebase3
-		kdebase3-ksysguardd
-		kdebase3-SuSE
-		kdebindings3-python
-		kdelibs3
-		kdelibs3-doc
-		kernel-default
-		kino
-		kio_slp
-		klogd
-		krb5
-		krb5-client
-		ksymoops
-		ldapcpplib
-		less
-		lftp
-		libacl
-		libao
-		libapparmor
-		libart_lgpl
-		libattr
-		libavc1394
-		libbeagle
-		libbonobo
-		libbonoboui
-		libbtctl
-		libcap
-		libcddb
-		libcdio
-		libcom_err
-		libcroco
-		libdc1394
-		libdrm
-		libdv
-		libdvdnav
-		libdvdread
-		libEMF
-		libevent
-		libexif
-		libgail-gnome
-		libgcc
-		libgcj
-		libgcrypt
-		libgda
-		libgdiplus
-		libgimpprint
-		libglade2
-		libgnome
-		libgnomecanvas
-		libgnomecups
-		libgnomedb
-		libgnomeprint
-		libgnomeprintui
-		libgnomesu
-		libgnomeui
-		libgpg-error
-		libgphoto2
-		libgsf
-		libgsf-gnome
-		libgssapi
-		libgtkhtml
-		libgtop
-		libicu
-		libid3tag
-		libidl
-		libidn
-		libieee1284
-		libiniparser
-		libipoddevice
-		libjasper
-		libjpeg
-		libksba
-		liblcms
-		libmikmod
-		libmng
-		libmusicbrainz
-		libnetpbm
-		libnjb
-		libnl
-		libnotify
-		libnscd
-		libnvtv
-		libogg
-		liboil
-		libopencdk
-		libosip2
-		libpcap
-		libpng
-		libquicktime
-		libraw1394
-		librpcsecgss
-		librsvg
-		libsamplerate
-		libsexy
-		libshout
-		libsigc++2
-		libsmbclient
-		libsndfile
-		libsoup
-		libstdc++
-		libstroke
-		libsvg
-		libsvg-cairo
-		libtheora
-		libtiff
-		libtool
-		libusb
-		libvisual
-		libvorbis
-		libwmf
-		libwnck
-		libxcrypt
-		libxklavier
-		libxml2
-		libxml2-python
-		libxslt
-		liby2util
-		libzio
-		libzypp
-		libzypp-zmd-backend
-		liferea
-		lilo
-		limal
-		limal-bootloader
-		limal-perl
-		linphone
-		linphone-applet
-		linux-atm-lib
-		lirc
-		log4net
-		logrotate
-		loudmouth
-		lsb
-		lsof
-		lua
-		lukemftp
-		lzo
-		m4
-		mailx
-		make
-		man
-		man-pages
-		manufacturer-PPDs
-		master-boot-code
-		mc
-		mdadm
-		mDNSResponder
-		mDNSResponder-lib
-		mergeant
-		Mesa
-		metacity
-		metacity-themes
-		microcode_ctl
-		mingetty
-		mjpegtools
-		mkinitrd
-		mkisofs
-		mktemp
-		module-init-tools
-		mono-core
-		mono-data
-		mono-data-sqlite
-		mono-web
-		MozillaFirefox
-		MozillaFirefox-translations
-		mozilla-nspr
-		mozilla-nss
-		mozilla-xulrunner
-		mtools
-		multisync
-		multisync-backup
-		multisync-evolution
-		multisync-irmc
-		multisync-irmc-bluetooth
-		multisync-ldap
-		multisync-opie
-		multisync-syncml
-		myspell-american
-		myspell-british
-		nano
-		nautilus
-		nautilus-cd-burner
-		nautilus-open-terminal
-		nautilus-sendto
-		nautilus-share
-		ncurses
-		neon
-		netcat
-		netcfg
-		netpbm
-		net-snmp
-		net-tools
-		NetworkManager
-		NetworkManager-gnome
-		nfsidmap
-		nfs-utils
-		notification-daemon
-		novfs-kmp-default
-		nscd
-		ntfsprogs
-		openct
-		OpenEXR
-		openh323
-		openldap2-client
-		openmotif-libs
-		openobex
-		OpenOffice_org
-		OpenOffice_org-gnome
-		opensc
-		openslp
-		opensp
-		openssh
-		openssh-askpass
-		openssl
-		orbit2
-		pam
-		pam_krb5
-		pam-modules
-		pan
-		pango
-		parted
-		patch
-		pax
-		pciutils
-		pcre
-		pcsc-lite
-		perl
-		perl-Bootloader
-		perl-Compress-Zlib
-		perl-Config-Crontab
-		perl-Crypt-SmbHash
-		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-Parse-RecDescent
-		perl-PDA-Pilot
-		perl-PlRPC
-		perl-spamassassin
-		perl-TermReadKey
-		perl-TermReadLine-Gnu
-		perl-TimeDate
-		perl-URI
-		perl-X500-DN
-		perl-XML-LibXML
-		perl-XML-LibXML-Common
-		perl-XML-NamespaceSupport
-		perl-XML-Parser
-		perl-XML-SAX
-		perl-XML-Writer
-		permissions
-		pilot-link
-		pin
-		pinentry
-		planner
-		pmtools
-		poppler
-		poppler-glib
-		popt
-		portmap
-		postfix
-		powersave
-		powersave-libs
-		ppp
-		pptp
-		procinfo
-		procmail
-		procps
-		providers
-		psiconv
-		psmisc
-		pstoedit
-		pwdutils
-		pwlib
-		python
-		python-cairo
-		python-gnome
-		python-gnome-extras
-		python-gtk
-		python-imaging
-		python-numeric
-		python-orbit
-		python-qt
-		python-tk
-		python-xml
-		qscintilla
-		qt3
-		readline
-		recode
-		reiserfs
-		release-notes
-		resapplet
-		resmgr
-		rpm
-		rrdtool
-		rsh
-		rsync
-		rug
-		samba
-		samba-client
-		samba-winbind
-		sane
-		sash
-		sax2
-		sax2-gui
-		sax2-ident
-		sax2-libsax
-		sax2-libsax-perl
-		sax2-tools
-		scpm
-		screen
-		scrollkeeper
-		scsi
-		SDL
-		SDL_image
-		SDL_mixer
-		SDL_net
-		SDL_perl
-		SDL_ttf
-		sed
-		sensors
-		setserial
-		sgml-skel
-		shared-mime-info
-		siga
-		sisctrl
-		skencil
-		slang
-		smpppd
-		sound-juicer
-		sox
-		spamassassin
-		speex
-		sqlite
-		sqlite2
-		src_vipa
-		startup-notification
-		strace
-		sudo
-		supertux
-		suse-build-key
-		SuSEfirewall2
-		susehelp
-		susehelp_en
-		suselinux-manual_en
-		suseRegister
-		suse-release
-		suspend
-		sysconfig
-		sysfsutils
-		syslinux
-		syslog-ng
-		sysvinit
-		taglib
-		tango-icon-theme
-		tar
-		tcl
-		tcpd
-		tcsh
-		telnet
-		terminfo
-		testgart
-		thinkeramik-style
-		tightvnc
-		timezone
-		tiny-nvidia-installer
-		tix
-		tk
-		tomboy
-		totem
-		tree
-		udev
-		unclutter
-		unix2dos
-		unixODBC
-		unrar
-		unzip
-		update-alternatives
-		usbutils
-		utempter
-		util-linux
-		v4l-conf
-		vacation
-		vcdimager
-		vim
-		vte
-		w3m
-		wbxml2
-		wdiff
-		wget
-		WindowMaker
-		WindowMaker-applets
-		WindowMaker-themes
-		wireless-tools
-		words
-		wpa_supplicant
-		wv
-		wvdial
-		wvstreams
-		x11-input-gunze
-		x11-input-synaptics
-		x11-input-wacom
-		x11-tools
-		xdelta
-		xdg-menu
-		xdmbgrd
-		xfsprogs
-		xine-lib
-		xinetd
-		xkeyboard-config
-		xli
-		xlockmore
-		xmlcharent
-		xmms-lib
-		xmoto
-		xmset
-		xntp
-		xorg-x11
-		xorg-x11-driver-video
-		xorg-x11-driver-video-nvidia
-		xorg-x11-fonts-100dpi
-		xorg-x11-fonts-75dpi
-		xorg-x11-fonts-scalable
-		xorg-x11-libs
-		xorg-x11-server
-		xorg-x11-server-glx
-		xorg-x11-Xnest
-		xorg-x11-Xvnc
-		xpdf
-		xpdf-tools
-		xsane
-		xscreensaver
-		xterm
-		xtermset
-		yast2
-		yast2-apparmor
-		yast2-backup
-		yast2-bluetooth
-		yast2-bootfloppy
-		yast2-bootloader
-		yast2-control-center
-		yast2-core
-		yast2-country
-		yast2-dhcp-server
-		yast2-dns-server
-		yast2-firewall
-		yast2-hardware-detection
-		yast2-http-server
-		yast2-inetd
-		yast2-installation
-		yast2-irda
-		yast2-kerberos-client
-		yast2-ldap
-		yast2-ldap-client
-		yast2-mail
-		yast2-mail-aliases
-		yast2-mouse
-		yast2-ncurses
-		yast2-network
-		yast2-nfs-client
-		yast2-nfs-server
-		yast2-nis-client
-		yast2-nis-server
-		yast2-ntp-client
-		yast2-online-update
-		yast2-online-update-frontend
-		yast2-packager
-		yast2-pam
-		yast2-perl-bindings
-		yast2-phone-services
-		yast2-pkg-bindings
-		yast2-power-management
-		yast2-powertweak
-		yast2-printer
-		yast2-profile-manager
-		yast2-qt
-		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-lib
-		yast2-support
-		yast2-sysconfig
-		yast2-tftp-server
-		yast2-theme-SuSELinux
-		yast2-trans-de
-		yast2-transfer
-		yast2-trans-stats
-		yast2-tune
-		yast2-tv
-		yast2-update
-		yast2-users
-		yast2-vm
-		yast2-x11
-		yast2-xml
-		yelp
-		ypbind
-		yp-tools
-		zenity
-		zen-updater
-		zip
-		ziptool
-		zisofs-tools
-		zlib
-		zmd
-		zsh
-		zvbi
-	END
+    base = minimal
+    packages = <<END
+        3ddiag
+        855resolution
+        a2ps
+        aaa_base
+        aaa_skel
+        aalib
+        acl
+        acpid
+        alsa
+        alsa-firmware
+        alsa-tools
+        apparmor-docs
+        apparmor-parser
+        apparmor-profiles
+        apparmor-utils
+        arts
+        art-sharp
+        art-sharp2
+        ash
+        aspell
+        aspell-en
+        at
+        atk
+        at-spi
+        attr
+        audiofile
+        audit
+        audit-libs
+        autofs
+        autoyast2
+        autoyast2-installation
+        awesfx
+        banshee
+        banshee-engine-gst
+        banshee-plugins-DAAP
+        bash
+        bc
+        beagle
+        beagle-evolution
+        beagle-firefox
+        beagle-gui
+        beagle-index
+        bind-libs
+        bind-utils
+        binutils
+        bitstream-vera
+        blam
+        blocxx
+        blt
+        bluez-libs
+        bluez-utils
+        boost
+        bootsplash
+        bootsplash-theme-SuSE
+        bug-buddy
+        busybox
+        bzip2
+        cabextract
+        cairo
+        capi4linux
+        cdparanoia
+        cdrdao
+        cdrecord
+        CheckHardware
+        checkmedia
+        cifs-mount
+        compat
+        compat-curl2
+        compat-libstdc++
+        compat-openssl097g
+        contact-lookup-applet
+        control-center2
+        convmv
+        coreutils
+        cpio
+        cpp
+        cpufrequtils
+        cracklib
+        cron
+        Crystalcursors
+        cups
+        cups-client
+        cups-drivers
+        cups-drivers-stp
+        cups-libs
+        cups-SUSE-ppds-dat
+        curl
+        cyrus-sasl
+        cyrus-sasl-saslauthd
+        dasher
+        db
+        dbus-1
+        dbus-1-glib
+        dbus-1-gtk
+        dbus-1-mono
+        dbus-1-python
+        dbus-1-qt3
+        dbus-1-x11
+        dcraw
+        dejavu
+        deltarpm
+        desktop-data-SuSE
+        desktop-file-utils
+        desktop-translations
+        device-mapper
+        devs
+        dhcdbd
+        dhcp
+        dhcpcd
+        dhcp-client
+        dia
+        dialog
+        diffutils
+        DirectFB
+        dirmngr
+        dmraid
+        docbook_4
+        dos2unix
+        dosbootdisk
+        dosfstools
+        dvd+rw-tools
+        e2fsprogs
+        ed
+        eel
+        efont-unicode
+        eject
+        enigma
+        eog
+        epiphany
+        epiphany-extensions
+        esound
+        ethtool
+        evince
+        evolution
+        evolution-data-server
+        evolution-exchange
+        evolution-pilot
+        evolution-sharp
+        evolution-webcal
+        expat
+        fam
+        fam-server
+        fbset
+        festival
+        file
+        file-roller
+        fileshareset
+        filesystem
+        fillup
+        filters
+        findutils
+        finger
+        flac
+        fontconfig
+        fonts-config
+        foomatic-filters
+        freeciv
+        freeglut
+        freetype
+        freetype2
+        fribidi
+        frozen-bubble
+        f-spot
+        fvwm2
+        gail
+        gaim
+        gal2
+        gawk
+        gcalctool
+        gconf2
+        gconf-editor
+        gconf-sharp
+        gconf-sharp2
+        gdb
+        gdbm
+        gdk-pixbuf
+        gdm
+        gecko-sharp
+        gecko-sharp2
+        gedit
+        gettext
+        ghex
+        ghostscript-fonts-other
+        ghostscript-fonts-std
+        ghostscript-library
+        ghostscript-x11
+        giflib
+        gimp
+        gimp-cmyk
+        gimp-help
+        glade-sharp
+        glade-sharp2
+        gle
+        glib
+        glib2
+        glibc
+        glibc-i18ndata
+        glibc-locale
+        glibmm24
+        glib-sharp
+        glib-sharp2
+        glitz
+        gmime
+        gnet
+        gnome2-SuSE
+        gnome2-user-docs
+        gnome-applets
+        gnome-audio
+        gnome-backgrounds
+        gnome-blog
+        gnome-bluetooth
+        gnome-cups-manager
+        gnome-desktop
+        gnome-doc-utils
+        gnome-filesystem
+        gnome-games
+        gnome-icon-theme
+        gnome-keyring
+        gnome-keyring-manager
+        gnome-mag
+        gnome-media
+        gnomemeeting
+        gnome-menus
+        gnome-mime-data
+        gnome-netstatus
+        gnome-nettool
+        gnome-panel
+        gnome-pilot
+        gnome-power-manager
+        gnome-printer-add
+        gnome-screensaver
+        gnome-session
+        gnome-sharp
+        gnome-sharp2
+        gnome-speech
+        gnome-spell2
+        gnome-system-monitor
+        gnome-terminal
+        gnome-themes
+        gnome-utils
+        gnome-vfs2
+        gnome-vfs-sharp2
+        gnome-volume-manager
+        gnopernicus
+        gnumeric
+        gnutls
+        goffice
+        gok
+        gpart
+        gpg
+        gpg2
+        gpgme
+        gpm
+        grep
+        groff
+        grub
+        gsf-sharp
+        gstreamer010
+        gstreamer010-plugins-base
+        gstreamer010-plugins-base-oil
+        gstreamer010-plugins-base-visual
+        gstreamer010-plugins-good
+        gtk
+        gtk2
+        gtk2-engines
+        gtk2-themes
+        gtk-engines
+        gtkhtml2
+        gtkhtml-sharp2
+        gtklp
+        gtkmm24
+        gtk-sharp
+        gtk-sharp2
+        gtk-sharp2-gapi
+        gtk-sharp-gapi
+        gtksourceview
+        gtkspell
+        gucharmap
+        guile
+        gzip
+        hal
+        hal-gnome
+        hal-resmgr
+        hdparm
+        hermes
+        hplip
+        hplip-hpijs
+        htdig
+        hwinfo
+        i4l-base
+        i4lfirm
+        i4l-isdnlog
+        id3lib
+        ifnteuro
+        ifplugd
+        ImageMagick
+        ImageMagick-Magick++
+        imlib
+        info
+        info2html
+        initviocons
+        inkscape
+        insserv
+        intlfnts
+        ipod-sharp
+        iproute2
+        iptables
+        iputils
+        isapnp
+        iso-codes
+        iso_ent
+        ispell
+        ispell-american
+        ispell-british
+        jack
+        java-1_4_2-gcj-compat
+        jfsutils
+        joe
+        jpackage-utils
+        kbd
+        kdebase3
+        kdebase3-ksysguardd
+        kdebase3-SuSE
+        kdebindings3-python
+        kdelibs3
+        kdelibs3-doc
+        kernel-default
+        kino
+        kio_slp
+        klogd
+        krb5
+        krb5-client
+        ksymoops
+        ldapcpplib
+        less
+        lftp
+        libacl
+        libao
+        libapparmor
+        libart_lgpl
+        libattr
+        libavc1394
+        libbeagle
+        libbonobo
+        libbonoboui
+        libbtctl
+        libcap
+        libcddb
+        libcdio
+        libcom_err
+        libcroco
+        libdc1394
+        libdrm
+        libdv
+        libdvdnav
+        libdvdread
+        libEMF
+        libevent
+        libexif
+        libgail-gnome
+        libgcc
+        libgcj
+        libgcrypt
+        libgda
+        libgdiplus
+        libgimpprint
+        libglade2
+        libgnome
+        libgnomecanvas
+        libgnomecups
+        libgnomedb
+        libgnomeprint
+        libgnomeprintui
+        libgnomesu
+        libgnomeui
+        libgpg-error
+        libgphoto2
+        libgsf
+        libgsf-gnome
+        libgssapi
+        libgtkhtml
+        libgtop
+        libicu
+        libid3tag
+        libidl
+        libidn
+        libieee1284
+        libiniparser
+        libipoddevice
+        libjasper
+        libjpeg
+        libksba
+        liblcms
+        libmikmod
+        libmng
+        libmusicbrainz
+        libnetpbm
+        libnjb
+        libnl
+        libnotify
+        libnscd
+        libnvtv
+        libogg
+        liboil
+        libopencdk
+        libosip2
+        libpcap
+        libpng
+        libquicktime
+        libraw1394
+        librpcsecgss
+        librsvg
+        libsamplerate
+        libsexy
+        libshout
+        libsigc++2
+        libsmbclient
+        libsndfile
+        libsoup
+        libstdc++
+        libstroke
+        libsvg
+        libsvg-cairo
+        libtheora
+        libtiff
+        libtool
+        libusb
+        libvisual
+        libvorbis
+        libwmf
+        libwnck
+        libxcrypt
+        libxklavier
+        libxml2
+        libxml2-python
+        libxslt
+        liby2util
+        libzio
+        libzypp
+        libzypp-zmd-backend
+        liferea
+        lilo
+        limal
+        limal-bootloader
+        limal-perl
+        linphone
+        linphone-applet
+        linux-atm-lib
+        lirc
+        log4net
+        logrotate
+        loudmouth
+        lsb
+        lsof
+        lua
+        lukemftp
+        lzo
+        m4
+        mailx
+        make
+        man
+        man-pages
+        manufacturer-PPDs
+        master-boot-code
+        mc
+        mdadm
+        mDNSResponder
+        mDNSResponder-lib
+        mergeant
+        Mesa
+        metacity
+        metacity-themes
+        microcode_ctl
+        mingetty
+        mjpegtools
+        mkinitrd
+        mkisofs
+        mktemp
+        module-init-tools
+        mono-core
+        mono-data
+        mono-data-sqlite
+        mono-web
+        MozillaFirefox
+        MozillaFirefox-translations
+        mozilla-nspr
+        mozilla-nss
+        mozilla-xulrunner
+        mtools
+        multisync
+        multisync-backup
+        multisync-evolution
+        multisync-irmc
+        multisync-irmc-bluetooth
+        multisync-ldap
+        multisync-opie
+        multisync-syncml
+        myspell-american
+        myspell-british
+        nano
+        nautilus
+        nautilus-cd-burner
+        nautilus-open-terminal
+        nautilus-sendto
+        nautilus-share
+        ncurses
+        neon
+        netcat
+        netcfg
+        netpbm
+        net-snmp
+        net-tools
+        NetworkManager
+        NetworkManager-gnome
+        nfsidmap
+        nfs-utils
+        notification-daemon
+        novfs-kmp-default
+        nscd
+        ntfsprogs
+        openct
+        OpenEXR
+        openh323
+        openldap2-client
+        openmotif-libs
+        openobex
+        OpenOffice_org
+        OpenOffice_org-gnome
+        opensc
+        openslp
+        opensp
+        openssh
+        openssh-askpass
+        openssl
+        orbit2
+        pam
+        pam_krb5
+        pam-modules
+        pan
+        pango
+        parted
+        patch
+        pax
+        pciutils
+        pcre
+        pcsc-lite
+        perl
+        perl-Bootloader
+        perl-Compress-Zlib
+        perl-Config-Crontab
+        perl-Crypt-SmbHash
+        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-Parse-RecDescent
+        perl-PDA-Pilot
+        perl-PlRPC
+        perl-spamassassin
+        perl-TermReadKey
+        perl-TermReadLine-Gnu
+        perl-TimeDate
+        perl-URI
+        perl-X500-DN
+        perl-XML-LibXML
+        perl-XML-LibXML-Common
+        perl-XML-NamespaceSupport
+        perl-XML-Parser
+        perl-XML-SAX
+        perl-XML-Writer
+        permissions
+        pilot-link
+        pin
+        pinentry
+        planner
+        pmtools
+        poppler
+        poppler-glib
+        popt
+        portmap
+        postfix
+        powersave
+        powersave-libs
+        ppp
+        pptp
+        procinfo
+        procmail
+        procps
+        providers
+        psiconv
+        psmisc
+        pstoedit
+        pwdutils
+        pwlib
+        python
+        python-cairo
+        python-gnome
+        python-gnome-extras
+        python-gtk
+        python-imaging
+        python-numeric
+        python-orbit
+        python-qt
+        python-tk
+        python-xml
+        qscintilla
+        qt3
+        readline
+        recode
+        reiserfs
+        release-notes
+        resapplet
+        resmgr
+        rpm
+        rrdtool
+        rsh
+        rsync
+        rug
+        samba
+        samba-client
+        samba-winbind
+        sane
+        sash
+        sax2
+        sax2-gui
+        sax2-ident
+        sax2-libsax
+        sax2-libsax-perl
+        sax2-tools
+        scpm
+        screen
+        scrollkeeper
+        scsi
+        SDL
+        SDL_image
+        SDL_mixer
+        SDL_net
+        SDL_perl
+        SDL_ttf
+        sed
+        sensors
+        setserial
+        sgml-skel
+        shared-mime-info
+        siga
+        sisctrl
+        skencil
+        slang
+        smpppd
+        sound-juicer
+        sox
+        spamassassin
+        speex
+        sqlite
+        sqlite2
+        src_vipa
+        startup-notification
+        strace
+        sudo
+        supertux
+        suse-build-key
+        SuSEfirewall2
+        susehelp
+        susehelp_en
+        suselinux-manual_en
+        suseRegister
+        suse-release
+        suspend
+        sysconfig
+        sysfsutils
+        syslinux
+        syslog-ng
+        sysvinit
+        taglib
+        tango-icon-theme
+        tar
+        tcl
+        tcpd
+        tcsh
+        telnet
+        terminfo
+        testgart
+        thinkeramik-style
+        tightvnc
+        timezone
+        tiny-nvidia-installer
+        tix
+        tk
+        tomboy
+        totem
+        tree
+        udev
+        unclutter
+        unix2dos
+        unixODBC
+        unrar
+        unzip
+        update-alternatives
+        usbutils
+        utempter
+        util-linux
+        v4l-conf
+        vacation
+        vcdimager
+        vim
+        vte
+        w3m
+        wbxml2
+        wdiff
+        wget
+        WindowMaker
+        WindowMaker-applets
+        WindowMaker-themes
+        wireless-tools
+        words
+        wpa_supplicant
+        wv
+        wvdial
+        wvstreams
+        x11-input-gunze
+        x11-input-synaptics
+        x11-input-wacom
+        x11-tools
+        xdelta
+        xdg-menu
+        xdmbgrd
+        xfsprogs
+        xine-lib
+        xinetd
+        xkeyboard-config
+        xli
+        xlockmore
+        xmlcharent
+        xmms-lib
+        xmoto
+        xmset
+        xntp
+        xorg-x11
+        xorg-x11-driver-video
+        xorg-x11-driver-video-nvidia
+        xorg-x11-fonts-100dpi
+        xorg-x11-fonts-75dpi
+        xorg-x11-fonts-scalable
+        xorg-x11-libs
+        xorg-x11-server
+        xorg-x11-server-glx
+        xorg-x11-Xnest
+        xorg-x11-Xvnc
+        xpdf
+        xpdf-tools
+        xsane
+        xscreensaver
+        xterm
+        xtermset
+        yast2
+        yast2-apparmor
+        yast2-backup
+        yast2-bluetooth
+        yast2-bootfloppy
+        yast2-bootloader
+        yast2-control-center
+        yast2-core
+        yast2-country
+        yast2-dhcp-server
+        yast2-dns-server
+        yast2-firewall
+        yast2-hardware-detection
+        yast2-http-server
+        yast2-inetd
+        yast2-installation
+        yast2-irda
+        yast2-kerberos-client
+        yast2-ldap
+        yast2-ldap-client
+        yast2-mail
+        yast2-mail-aliases
+        yast2-mouse
+        yast2-ncurses
+        yast2-network
+        yast2-nfs-client
+        yast2-nfs-server
+        yast2-nis-client
+        yast2-nis-server
+        yast2-ntp-client
+        yast2-online-update
+        yast2-online-update-frontend
+        yast2-packager
+        yast2-pam
+        yast2-perl-bindings
+        yast2-phone-services
+        yast2-pkg-bindings
+        yast2-power-management
+        yast2-powertweak
+        yast2-printer
+        yast2-profile-manager
+        yast2-qt
+        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-lib
+        yast2-support
+        yast2-sysconfig
+        yast2-tftp-server
+        yast2-theme-SuSELinux
+        yast2-trans-de
+        yast2-transfer
+        yast2-trans-stats
+        yast2-tune
+        yast2-tv
+        yast2-update
+        yast2-users
+        yast2-vm
+        yast2-x11
+        yast2-xml
+        yelp
+        ypbind
+        yp-tools
+        zenity
+        zen-updater
+        zip
+        ziptool
+        zisofs-tools
+        zlib
+        zmd
+        zsh
+        zvbi
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/suse-10.1_x86_64/settings.example b/lib/distro-info/suse-10.1_x86_64/settings.example
index 2c360086..726b979f 100644
--- a/lib/distro-info/suse-10.1_x86_64/settings.example
+++ b/lib/distro-info/suse-10.1_x86_64/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/suse-10.2/settings.default b/lib/distro-info/suse-10.2/settings.default
index 6f230c76..5b00c1e8 100644
--- a/lib/distro-info/suse-10.2/settings.default
+++ b/lib/distro-info/suse-10.2/settings.default
@@ -1,1062 +1,1062 @@
 bootstrap-packages = <<END
-	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/bzip2-1.0.3-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/glibc-2.5-25.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/popt-1.7-304.i586.rpm
-	i586/readline-5.1-55.i586.rpm
-	i586/reiserfs-3.6.19-37.i586.rpm
-	i586/rpm-4.4.2-76.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
-	i586/zlib-1.2.3-33.i586.rpm
-	noarch/pciutils-ids-2006.11.18-2.noarch.rpm
-	noarch/suse-build-key-1.0-707.noarch.rpm
+    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/bzip2-1.0.3-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/glibc-2.5-25.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/popt-1.7-304.i586.rpm
+    i586/readline-5.1-55.i586.rpm
+    i586/reiserfs-3.6.19-37.i586.rpm
+    i586/rpm-4.4.2-76.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
+    i586/zlib-1.2.3-33.i586.rpm
+    noarch/pciutils-ids-2006.11.18-2.noarch.rpm
+    noarch/suse-build-key-1.0-707.noarch.rpm
 END
 <metapackager smart>
-	packages = <<END
-		i586/python-2.5-19.i586.rpm
-		i586/python-xml-2.5-19.i586.rpm
-		i586/rpm-python-4.4.2-76.i586.rpm
-		i586/smart-0.42-43.i586.rpm
-	END
+    packages = <<END
+        i586/python-2.5-19.i586.rpm
+        i586/python-xml-2.5-19.i586.rpm
+        i586/rpm-python-4.4.2-76.i586.rpm
+        i586/smart-0.42-43.i586.rpm
+    END
 </metapackager>
 <metapackager yum>
-	packages = <<END
-		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/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/rpm-python-4.4.2-76.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
-	END
+    packages = <<END
+        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/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/rpm-python-4.4.2-76.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
+    END
 </metapackager>
 package-subdir = suse
 prereq-packages = <<END
-	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
+    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
 END
 <repository base>
-	name = openSUSE 10.2
-	repo-subdir = suse
-	file-for-speedtest = suse/setup/descr/packages.en
+    name = openSUSE 10.2
+    repo-subdir = suse
+    file-for-speedtest = suse/setup/descr/packages.en
 </repository>
 <repository base_non-oss>
-	name = openSUSE 10.2 non-OSS
-	repo-subdir = suse
-	file-for-speedtest = suse/setup/descr/packages.en
+    name = openSUSE 10.2 non-OSS
+    repo-subdir = suse
+    file-for-speedtest = suse/setup/descr/packages.en
 </repository>
-<repository	base_update>
-	name = openSUSE 10.2 updates
-	file-for-speedtest = repodata/primary.xml.gz
+<repository    base_update>
+    name = openSUSE 10.2 updates
+    file-for-speedtest = repodata/primary.xml.gz
 </repository>
 <selection minimal>
-	packages = <<END
-		glibc-locale
-	END
+    packages = <<END
+        glibc-locale
+    END
 </selection>
 <selection textmode>
-	base = minimal
-	packages = <<END
-		acl
-		acpid
-		apparmor-docs
-		apparmor-profiles
-		apparmor-utils
-		ash
-		at
-		atk
-		attr
-		audit
-		autofs
-		autoyast2
-		bc
-		bind-libs
-		bind-utils
-		boost
-		bootsplash-theme-SuSE
-		compat
-		compat-libstdc++
-		compat-openssl097g
-		cpufrequtils
-		cron
-		cups-client
-		cyrus-sasl
-		cyrus-sasl-saslauthd
-		db-utils
-		deltarpm
-		dhcpcd
-		dmraid
-		dos2unix
-		dosfstools
-		ed
-		eject
-		ethtool
-		fbset
-		findutils
-		fontconfig
-		freetype2
-		gdb
-		gdbm
-		glib2
-		glibc-i18ndata
-		gpm
-		hal-resmgr
-		hfsutils
-		ifplugd
-		initviocons
-		inst-source-utils
-		iputils
-		joe
-		kbd
-		kernel-default
-		krb5
-		ksh
-		ksymoops
-		libacl
-		libapparmor
-		libart_lgpl
-		libattr
-		libcap
-		libcom_err
-		libdrm
-		libevent
-		libgcc41
-		libgcrypt
-		libgimpprint
-		libgpg-error
-		libicu
-		libidn
-		libjpeg
-		liblazy
-		liblcms
-		libltdl
-		libmng
-		libnscd
-		libopencdk
-		libpcap
-		libpng
-		librpcsecgss
-		libstdc++41
-		libtiff
-		libusb
-		libvolume_id
-		libxcrypt
-		lukemftp
-		lvm2
-		lzo
-		mailx
-		man
-		man-pages
-		microcode_ctl
-		module-init-tools
-		multipath-tools
-		nbd
-		ncurses
-		net-snmp
-		nfs-utils
-		nfsidmap
-		nscd
-		ntfsprogs
-		openSUSE-release
-		openct
-		opensc
-		openssh
-		openssl
-		patch
-		pax
-		perl-Crypt-SmbHash
-		perl-URI
-		perl-XML-Parser
-		perl-XML-Writer
-		postfix
-		powersave-libs
-		preload
-		procinfo
-		procmail
-		procps
-		providers
-		qlogic-firmware
-		recode
-		rrdtool
-		rsync
-		sash
-		screen
-		scsi
-		sensors
-		sharutils
-		smart
-		smartmontools
-		smpppd
-		squashfs-kmp-default
-		strace
-		sudo
-		suse-build-key
-		suspend
-		sysfsutils
-		syslog-ng
-		tcpd
-		tcpdump
-		tcsh
-		telnet
-		terminfo
-		timezone
-		ulimit
-		usbutils
-		utempter
-		vim
-		wdiff
-		wget
-		wvstreams
-		xfsprogs
-		xinetd
-		xntp
-		yast2-apparmor
-		yast2-backup
-		yast2-bluetooth
-		yast2-bootfloppy
-		yast2-irda
-		yast2-iscsi-client
-		yast2-mail
-		yast2-ncurses
-		yast2-nis-client
-		yast2-ntp-client
-		yast2-online-update-frontend
-		yast2-power-management
-		yast2-powertweak
-		yast2-profile-manager
-		yast2-repair
-		yast2-restore
-		yast2-runlevel
-		yast2-samba-client
-		yast2-scanner
-		yast2-sudo
-		yast2-support
-		yast2-theme-openSUSE
-		yast2-trans-de
-		yast2-tv
-		ypbind
-		zip
-		zisofs-tools
-		zsh
-	END
+    base = minimal
+    packages = <<END
+        acl
+        acpid
+        apparmor-docs
+        apparmor-profiles
+        apparmor-utils
+        ash
+        at
+        atk
+        attr
+        audit
+        autofs
+        autoyast2
+        bc
+        bind-libs
+        bind-utils
+        boost
+        bootsplash-theme-SuSE
+        compat
+        compat-libstdc++
+        compat-openssl097g
+        cpufrequtils
+        cron
+        cups-client
+        cyrus-sasl
+        cyrus-sasl-saslauthd
+        db-utils
+        deltarpm
+        dhcpcd
+        dmraid
+        dos2unix
+        dosfstools
+        ed
+        eject
+        ethtool
+        fbset
+        findutils
+        fontconfig
+        freetype2
+        gdb
+        gdbm
+        glib2
+        glibc-i18ndata
+        gpm
+        hal-resmgr
+        hfsutils
+        ifplugd
+        initviocons
+        inst-source-utils
+        iputils
+        joe
+        kbd
+        kernel-default
+        krb5
+        ksh
+        ksymoops
+        libacl
+        libapparmor
+        libart_lgpl
+        libattr
+        libcap
+        libcom_err
+        libdrm
+        libevent
+        libgcc41
+        libgcrypt
+        libgimpprint
+        libgpg-error
+        libicu
+        libidn
+        libjpeg
+        liblazy
+        liblcms
+        libltdl
+        libmng
+        libnscd
+        libopencdk
+        libpcap
+        libpng
+        librpcsecgss
+        libstdc++41
+        libtiff
+        libusb
+        libvolume_id
+        libxcrypt
+        lukemftp
+        lvm2
+        lzo
+        mailx
+        man
+        man-pages
+        microcode_ctl
+        module-init-tools
+        multipath-tools
+        nbd
+        ncurses
+        net-snmp
+        nfs-utils
+        nfsidmap
+        nscd
+        ntfsprogs
+        openSUSE-release
+        openct
+        opensc
+        openssh
+        openssl
+        patch
+        pax
+        perl-Crypt-SmbHash
+        perl-URI
+        perl-XML-Parser
+        perl-XML-Writer
+        postfix
+        powersave-libs
+        preload
+        procinfo
+        procmail
+        procps
+        providers
+        qlogic-firmware
+        recode
+        rrdtool
+        rsync
+        sash
+        screen
+        scsi
+        sensors
+        sharutils
+        smart
+        smartmontools
+        smpppd
+        squashfs-kmp-default
+        strace
+        sudo
+        suse-build-key
+        suspend
+        sysfsutils
+        syslog-ng
+        tcpd
+        tcpdump
+        tcsh
+        telnet
+        terminfo
+        timezone
+        ulimit
+        usbutils
+        utempter
+        vim
+        wdiff
+        wget
+        wvstreams
+        xfsprogs
+        xinetd
+        xntp
+        yast2-apparmor
+        yast2-backup
+        yast2-bluetooth
+        yast2-bootfloppy
+        yast2-irda
+        yast2-iscsi-client
+        yast2-mail
+        yast2-ncurses
+        yast2-nis-client
+        yast2-ntp-client
+        yast2-online-update-frontend
+        yast2-power-management
+        yast2-powertweak
+        yast2-profile-manager
+        yast2-repair
+        yast2-restore
+        yast2-runlevel
+        yast2-samba-client
+        yast2-scanner
+        yast2-sudo
+        yast2-support
+        yast2-theme-openSUSE
+        yast2-trans-de
+        yast2-tv
+        ypbind
+        zip
+        zisofs-tools
+        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
+    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
+    base = textmode
+    packages = <<END
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
-	
\ No newline at end of file
+    
\ No newline at end of file
diff --git a/lib/distro-info/suse-10.2/settings.example b/lib/distro-info/suse-10.2/settings.example
index c32b0514..2905cef4 100644
--- a/lib/distro-info/suse-10.2/settings.example
+++ b/lib/distro-info/suse-10.2/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
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 de494bc6..190a0a4a 100644
--- a/lib/distro-info/suse-10.2_x86_64/settings.default
+++ b/lib/distro-info/suse-10.2_x86_64/settings.default
@@ -1,1062 +1,1062 @@
 bootstrap-packages = <<END
-	x86_64/aaa_base-10.2-38.x86_64.rpm
-	x86_64/aaa_skel-2006.5.19-20.x86_64.rpm
-	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
-	x86_64/cyrus-sasl-2.1.22-28.x86_64.rpm
-	x86_64/db-4.4.20-16.x86_64.rpm
-	x86_64/diffutils-2.8.7-38.x86_64.rpm
-	x86_64/e2fsprogs-1.39-21.x86_64.rpm
-	x86_64/file-4.17-23.x86_64.rpm
-	x86_64/filesystem-10.2-22.x86_64.rpm
-	x86_64/fillup-1.42-138.x86_64.rpm
-	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
-	x86_64/gzip-1.3.5-178.x86_64.rpm
-	x86_64/info-4.8-43.x86_64.rpm
-	x86_64/insserv-1.04.0-42.x86_64.rpm
-	x86_64/irqbalance-0.09-80.x86_64.rpm
-	x86_64/kernel-default-2.6.18.2-34.x86_64.rpm
-	x86_64/libacl-2.2.34-33.x86_64.rpm
-	x86_64/libattr-2.4.28-38.x86_64.rpm
-	x86_64/libcom_err-1.39-21.x86_64.rpm
-	x86_64/libgcc41-4.1.2_20061115-5.x86_64.rpm
-	x86_64/libstdc++41-4.1.2_20061115-5.x86_64.rpm
-	x86_64/libvolume_id-103-12.x86_64.rpm
-	x86_64/libxcrypt-2.4-30.x86_64.rpm
-	x86_64/libzio-0.2-20.x86_64.rpm
-	x86_64/limal-1.2.9-5.x86_64.rpm
-	x86_64/limal-bootloader-1.2.4-6.x86_64.rpm
-	x86_64/limal-perl-1.2.9-5.x86_64.rpm
-	x86_64/logrotate-3.7.4-21.x86_64.rpm
-	x86_64/mdadm-2.5.3-17.x86_64.rpm
-	x86_64/mingetty-0.9.6s-107.x86_64.rpm
-	x86_64/mkinitrd-1.2-149.x86_64.rpm
-	x86_64/mktemp-1.5-763.x86_64.rpm
-	x86_64/module-init-tools-3.2.2-62.x86_64.rpm
-	x86_64/ncurses-5.5-42.x86_64.rpm
-	x86_64/net-tools-1.60-606.x86_64.rpm
-	x86_64/openldap2-client-2.3.27-25.x86_64.rpm
-	x86_64/openssl-0.9.8d-17.x86_64.rpm
-	x86_64/openSUSE-release-10.2-35.x86_64.rpm
-	x86_64/pam-0.99.6.3-24.x86_64.rpm
-	x86_64/pciutils-2.2.4-13.x86_64.rpm
-	x86_64/pcre-6.7-21.x86_64.rpm
-	x86_64/perl-5.8.8-32.x86_64.rpm
-	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
+    x86_64/aaa_base-10.2-38.x86_64.rpm
+    x86_64/aaa_skel-2006.5.19-20.x86_64.rpm
+    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
+    x86_64/cyrus-sasl-2.1.22-28.x86_64.rpm
+    x86_64/db-4.4.20-16.x86_64.rpm
+    x86_64/diffutils-2.8.7-38.x86_64.rpm
+    x86_64/e2fsprogs-1.39-21.x86_64.rpm
+    x86_64/file-4.17-23.x86_64.rpm
+    x86_64/filesystem-10.2-22.x86_64.rpm
+    x86_64/fillup-1.42-138.x86_64.rpm
+    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
+    x86_64/gzip-1.3.5-178.x86_64.rpm
+    x86_64/info-4.8-43.x86_64.rpm
+    x86_64/insserv-1.04.0-42.x86_64.rpm
+    x86_64/irqbalance-0.09-80.x86_64.rpm
+    x86_64/kernel-default-2.6.18.2-34.x86_64.rpm
+    x86_64/libacl-2.2.34-33.x86_64.rpm
+    x86_64/libattr-2.4.28-38.x86_64.rpm
+    x86_64/libcom_err-1.39-21.x86_64.rpm
+    x86_64/libgcc41-4.1.2_20061115-5.x86_64.rpm
+    x86_64/libstdc++41-4.1.2_20061115-5.x86_64.rpm
+    x86_64/libvolume_id-103-12.x86_64.rpm
+    x86_64/libxcrypt-2.4-30.x86_64.rpm
+    x86_64/libzio-0.2-20.x86_64.rpm
+    x86_64/limal-1.2.9-5.x86_64.rpm
+    x86_64/limal-bootloader-1.2.4-6.x86_64.rpm
+    x86_64/limal-perl-1.2.9-5.x86_64.rpm
+    x86_64/logrotate-3.7.4-21.x86_64.rpm
+    x86_64/mdadm-2.5.3-17.x86_64.rpm
+    x86_64/mingetty-0.9.6s-107.x86_64.rpm
+    x86_64/mkinitrd-1.2-149.x86_64.rpm
+    x86_64/mktemp-1.5-763.x86_64.rpm
+    x86_64/module-init-tools-3.2.2-62.x86_64.rpm
+    x86_64/ncurses-5.5-42.x86_64.rpm
+    x86_64/net-tools-1.60-606.x86_64.rpm
+    x86_64/openldap2-client-2.3.27-25.x86_64.rpm
+    x86_64/openssl-0.9.8d-17.x86_64.rpm
+    x86_64/openSUSE-release-10.2-35.x86_64.rpm
+    x86_64/pam-0.99.6.3-24.x86_64.rpm
+    x86_64/pciutils-2.2.4-13.x86_64.rpm
+    x86_64/pcre-6.7-21.x86_64.rpm
+    x86_64/perl-5.8.8-32.x86_64.rpm
+    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
 <metapackager smart>
-	packages = <<END
-		x86_64/python-2.5-19.x86_64.rpm
-		x86_64/python-xml-2.5-19.x86_64.rpm
-		x86_64/rpm-python-4.4.2-76.x86_64.rpm
-		x86_64/smart-0.42-43.x86_64.rpm
-	END
+    packages = <<END
+        x86_64/python-2.5-19.x86_64.rpm
+        x86_64/python-xml-2.5-19.x86_64.rpm
+        x86_64/rpm-python-4.4.2-76.x86_64.rpm
+        x86_64/smart-0.42-43.x86_64.rpm
+    END
 </metapackager>
 <metapackager yum>
-	packages = <<END
-		x86_64/glib2-2.12.4-15.x86_64.rpm
-		x86_64/gnome-filesystem-0.1-288.x86_64.rpm
-		x86_64/libxml2-2.6.26-26.x86_64.rpm
-		x86_64/libxml2-python-2.6.26-29.x86_64.rpm
-		x86_64/python-2.5-19.x86_64.rpm
-		x86_64/python-sqlite-1.1.8-11.x86_64.rpm
-		x86_64/python-urlgrabber-3.1.0-18.x86_64.rpm
-		x86_64/python-xml-2.5-19.x86_64.rpm
-		x86_64/rpm-python-4.4.2-76.x86_64.rpm
-		x86_64/sqlite-3.3.8-14.x86_64.rpm
-		x86_64/yum-3.0.1-9.x86_64.rpm
-		x86_64/yum-metadata-parser-1.0.2-23.x86_64.rpm
-	END
+    packages = <<END
+        x86_64/glib2-2.12.4-15.x86_64.rpm
+        x86_64/gnome-filesystem-0.1-288.x86_64.rpm
+        x86_64/libxml2-2.6.26-26.x86_64.rpm
+        x86_64/libxml2-python-2.6.26-29.x86_64.rpm
+        x86_64/python-2.5-19.x86_64.rpm
+        x86_64/python-sqlite-1.1.8-11.x86_64.rpm
+        x86_64/python-urlgrabber-3.1.0-18.x86_64.rpm
+        x86_64/python-xml-2.5-19.x86_64.rpm
+        x86_64/rpm-python-4.4.2-76.x86_64.rpm
+        x86_64/sqlite-3.3.8-14.x86_64.rpm
+        x86_64/yum-3.0.1-9.x86_64.rpm
+        x86_64/yum-metadata-parser-1.0.2-23.x86_64.rpm
+    END
 </metapackager>
 package-subdir = suse
 prereq-packages = <<END
-	x86_64/bzip2-1.0.3-36.x86_64.rpm
-	x86_64/glibc-2.5-25.x86_64.rpm
-	x86_64/popt-1.7-304.x86_64.rpm
-	x86_64/rpm-4.4.2-76.x86_64.rpm
-	x86_64/zlib-1.2.3-33.x86_64.rpm
+    x86_64/bzip2-1.0.3-36.x86_64.rpm
+    x86_64/glibc-2.5-25.x86_64.rpm
+    x86_64/popt-1.7-304.x86_64.rpm
+    x86_64/rpm-4.4.2-76.x86_64.rpm
+    x86_64/zlib-1.2.3-33.x86_64.rpm
 END
 <repository base>
-	name = openSUSE 10.2
-	repo-subdir = suse
-	file-for-speedtest = suse/setup/descr/packages.en
+    name = openSUSE 10.2
+    repo-subdir = suse
+    file-for-speedtest = suse/setup/descr/packages.en
 </repository>
 <repository base_non-oss>
-	name = openSUSE 10.2 non-OSS
-	repo-subdir = suse
-	file-for-speedtest = suse/setup/descr/packages.en
+    name = openSUSE 10.2 non-OSS
+    repo-subdir = suse
+    file-for-speedtest = suse/setup/descr/packages.en
 </repository>
 <repository base_update>
-	name = openSUSE 10.2 updates
-	file-for-speedtest = repodata/primary.xml.gz
+    name = openSUSE 10.2 updates
+    file-for-speedtest = repodata/primary.xml.gz
 </repository>
 <selection minimal>
-	packages = <<END
-		glibc-locale
-	END
+    packages = <<END
+        glibc-locale
+    END
 </selection>
 <selection textmode>
-	base = minimal
-	packages = <<END
-		acl
-		acpid
-		apparmor-docs
-		apparmor-profiles
-		apparmor-utils
-		ash
-		at
-		atk
-		attr
-		audit
-		autofs
-		autoyast2
-		bc
-		bind-libs
-		bind-utils
-		boost
-		bootsplash-theme-SuSE
-		compat
-		compat-libstdc++
-		compat-openssl097g
-		cpufrequtils
-		cron
-		cups-client
-		cyrus-sasl
-		cyrus-sasl-saslauthd
-		db-utils
-		deltarpm
-		dhcpcd
-		dmraid
-		dos2unix
-		dosfstools
-		ed
-		eject
-		ethtool
-		fbset
-		findutils
-		fontconfig
-		freetype2
-		gdb
-		gdbm
-		glib2
-		glibc-i18ndata
-		gpm
-		hal-resmgr
-		hfsutils
-		ifplugd
-		initviocons
-		inst-source-utils
-		iputils
-		joe
-		kbd
-		kernel-default
-		krb5
-		ksh
-		ksymoops
-		libacl
-		libapparmor
-		libart_lgpl
-		libattr
-		libcap
-		libcom_err
-		libdrm
-		libevent
-		libgcc41
-		libgcrypt
-		libgimpprint
-		libgpg-error
-		libicu
-		libidn
-		libjpeg
-		liblazy
-		liblcms
-		libltdl
-		libmng
-		libnscd
-		libopencdk
-		libpcap
-		libpng
-		librpcsecgss
-		libstdc++41
-		libtiff
-		libusb
-		libvolume_id
-		libxcrypt
-		lukemftp
-		lvm2
-		lzo
-		mailx
-		man
-		man-pages
-		microcode_ctl
-		module-init-tools
-		multipath-tools
-		nbd
-		ncurses
-		net-snmp
-		nfs-utils
-		nfsidmap
-		nscd
-		ntfsprogs
-		openSUSE-release
-		openct
-		opensc
-		openssh
-		openssl
-		patch
-		pax
-		perl-Crypt-SmbHash
-		perl-URI
-		perl-XML-Parser
-		perl-XML-Writer
-		postfix
-		powersave-libs
-		preload
-		procinfo
-		procmail
-		procps
-		providers
-		qlogic-firmware
-		recode
-		rrdtool
-		rsync
-		sash
-		screen
-		scsi
-		sensors
-		sharutils
-		smart
-		smartmontools
-		smpppd
-		squashfs-kmp-default
-		strace
-		sudo
-		suse-build-key
-		suspend
-		sysfsutils
-		syslog-ng
-		tcpd
-		tcpdump
-		tcsh
-		telnet
-		terminfo
-		timezone
-		ulimit
-		usbutils
-		utempter
-		vim
-		wdiff
-		wget
-		wvstreams
-		xfsprogs
-		xinetd
-		xntp
-		yast2-apparmor
-		yast2-backup
-		yast2-bluetooth
-		yast2-bootfloppy
-		yast2-irda
-		yast2-iscsi-client
-		yast2-mail
-		yast2-ncurses
-		yast2-nis-client
-		yast2-ntp-client
-		yast2-online-update-frontend
-		yast2-power-management
-		yast2-powertweak
-		yast2-profile-manager
-		yast2-repair
-		yast2-restore
-		yast2-runlevel
-		yast2-samba-client
-		yast2-scanner
-		yast2-sudo
-		yast2-support
-		yast2-theme-openSUSE
-		yast2-trans-de
-		yast2-tv
-		ypbind
-		zip
-		zisofs-tools
-		zsh
-	END
+    base = minimal
+    packages = <<END
+        acl
+        acpid
+        apparmor-docs
+        apparmor-profiles
+        apparmor-utils
+        ash
+        at
+        atk
+        attr
+        audit
+        autofs
+        autoyast2
+        bc
+        bind-libs
+        bind-utils
+        boost
+        bootsplash-theme-SuSE
+        compat
+        compat-libstdc++
+        compat-openssl097g
+        cpufrequtils
+        cron
+        cups-client
+        cyrus-sasl
+        cyrus-sasl-saslauthd
+        db-utils
+        deltarpm
+        dhcpcd
+        dmraid
+        dos2unix
+        dosfstools
+        ed
+        eject
+        ethtool
+        fbset
+        findutils
+        fontconfig
+        freetype2
+        gdb
+        gdbm
+        glib2
+        glibc-i18ndata
+        gpm
+        hal-resmgr
+        hfsutils
+        ifplugd
+        initviocons
+        inst-source-utils
+        iputils
+        joe
+        kbd
+        kernel-default
+        krb5
+        ksh
+        ksymoops
+        libacl
+        libapparmor
+        libart_lgpl
+        libattr
+        libcap
+        libcom_err
+        libdrm
+        libevent
+        libgcc41
+        libgcrypt
+        libgimpprint
+        libgpg-error
+        libicu
+        libidn
+        libjpeg
+        liblazy
+        liblcms
+        libltdl
+        libmng
+        libnscd
+        libopencdk
+        libpcap
+        libpng
+        librpcsecgss
+        libstdc++41
+        libtiff
+        libusb
+        libvolume_id
+        libxcrypt
+        lukemftp
+        lvm2
+        lzo
+        mailx
+        man
+        man-pages
+        microcode_ctl
+        module-init-tools
+        multipath-tools
+        nbd
+        ncurses
+        net-snmp
+        nfs-utils
+        nfsidmap
+        nscd
+        ntfsprogs
+        openSUSE-release
+        openct
+        opensc
+        openssh
+        openssl
+        patch
+        pax
+        perl-Crypt-SmbHash
+        perl-URI
+        perl-XML-Parser
+        perl-XML-Writer
+        postfix
+        powersave-libs
+        preload
+        procinfo
+        procmail
+        procps
+        providers
+        qlogic-firmware
+        recode
+        rrdtool
+        rsync
+        sash
+        screen
+        scsi
+        sensors
+        sharutils
+        smart
+        smartmontools
+        smpppd
+        squashfs-kmp-default
+        strace
+        sudo
+        suse-build-key
+        suspend
+        sysfsutils
+        syslog-ng
+        tcpd
+        tcpdump
+        tcsh
+        telnet
+        terminfo
+        timezone
+        ulimit
+        usbutils
+        utempter
+        vim
+        wdiff
+        wget
+        wvstreams
+        xfsprogs
+        xinetd
+        xntp
+        yast2-apparmor
+        yast2-backup
+        yast2-bluetooth
+        yast2-bootfloppy
+        yast2-irda
+        yast2-iscsi-client
+        yast2-mail
+        yast2-ncurses
+        yast2-nis-client
+        yast2-ntp-client
+        yast2-online-update-frontend
+        yast2-power-management
+        yast2-powertweak
+        yast2-profile-manager
+        yast2-repair
+        yast2-restore
+        yast2-runlevel
+        yast2-samba-client
+        yast2-scanner
+        yast2-sudo
+        yast2-support
+        yast2-theme-openSUSE
+        yast2-trans-de
+        yast2-tv
+        ypbind
+        zip
+        zisofs-tools
+        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
+    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
+    base = textmode
+    packages = <<END
+    END
 </selection>
 <selection default>
-	base = minimal
+    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 c32b0514..2905cef4 100644
--- a/lib/distro-info/suse-10.2_x86_64/settings.example
+++ b/lib/distro-info/suse-10.2_x86_64/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/suse-10.3/settings.default b/lib/distro-info/suse-10.3/settings.default
index 789b33c7..ab167235 100644
--- a/lib/distro-info/suse-10.3/settings.default
+++ b/lib/distro-info/suse-10.3/settings.default
@@ -1,974 +1,974 @@
 bootstrap-packages = <<END
 END
 <metapackager smart>
-	packages = <<END
-	END
+    packages = <<END
+    END
 </metapackager>
 <metapackager yum>
-	packages = <<END
-	END
+    packages = <<END
+    END
 </metapackager>
 package-subdir = suse
 prereq-packages = <<END
 END
 <repository base>
-	name = openSUSE 10.3
-	repo-subdir = suse
-	file-for-speedtest = suse/setup/descr/packages.en
+    name = openSUSE 10.3
+    repo-subdir = suse
+    file-for-speedtest = suse/setup/descr/packages.en
 </repository>
 <repository base_non-oss>
-	name = openSUSE 10.3 non-OSS
-	repo-subdir = suse
-	file-for-speedtest = suse/setup/descr/packages.en
+    name = openSUSE 10.3 non-OSS
+    repo-subdir = suse
+    file-for-speedtest = suse/setup/descr/packages.en
 </repository>
-<repository	base_update>
-	name = openSUSE 10.3 updates
-	file-for-speedtest = repodata/primary.xml.gz
+<repository    base_update>
+    name = openSUSE 10.3 updates
+    file-for-speedtest = repodata/primary.xml.gz
 </repository>
 <selection minimal>
-	packages = <<END
-		glibc-locale
-	END
+    packages = <<END
+        glibc-locale
+    END
 </selection>
 <selection textmode>
-	base = minimal
-	packages = <<END
-		acl
-		acpid
-		apparmor-docs
-		apparmor-profiles
-		apparmor-utils
-		ash
-		at
-		atk
-		attr
-		audit
-		autofs
-		autoyast2
-		bc
-		bind-libs
-		bind-utils
-		boost
-		bootsplash-theme-SuSE
-		compat
-		compat-libstdc++
-		compat-openssl097g
-		cpufrequtils
-		cron
-		cups-client
-		cyrus-sasl
-		cyrus-sasl-saslauthd
-		db-utils
-		deltarpm
-		dhcpcd
-		dmraid
-		dos2unix
-		dosfstools
-		ed
-		eject
-		ethtool
-		fbset
-		findutils
-		fontconfig
-		freetype2
-		gdb
-		gdbm
-		glib2
-		glibc-i18ndata
-		gpm
-		hal-resmgr
-		hfsutils
-		ifplugd
-		initviocons
-		inst-source-utils
-		iputils
-		joe
-		kbd
-		kernel-default
-		krb5
-		ksh
-		ksymoops
-		libacl
-		libapparmor
-		libart_lgpl
-		libattr
-		libcap
-		libcom_err
-		libdrm
-		libevent
-		libgcc41
-		libgcrypt
-		libgimpprint
-		libgpg-error
-		libicu
-		libidn
-		libjpeg
-		liblazy
-		liblcms
-		libltdl
-		libmng
-		libnscd
-		libopencdk
-		libpcap
-		libpng
-		librpcsecgss
-		libstdc++41
-		libtiff
-		libusb
-		libvolume_id
-		libxcrypt
-		lukemftp
-		lvm2
-		lzo
-		mailx
-		man
-		man-pages
-		microcode_ctl
-		module-init-tools
-		multipath-tools
-		nbd
-		ncurses
-		net-snmp
-		nfs-utils
-		nfsidmap
-		nscd
-		ntfsprogs
-		openSUSE-release
-		openct
-		opensc
-		openssh
-		openssl
-		patch
-		pax
-		perl-Crypt-SmbHash
-		perl-URI
-		perl-XML-Parser
-		perl-XML-Writer
-		postfix
-		powersave-libs
-		preload
-		procinfo
-		procmail
-		procps
-		providers
-		qlogic-firmware
-		recode
-		rrdtool
-		rsync
-		sash
-		screen
-		scsi
-		sensors
-		sharutils
-		smart
-		smartmontools
-		smpppd
-		squashfs-kmp-default
-		strace
-		sudo
-		suse-build-key
-		suspend
-		sysfsutils
-		syslog-ng
-		tcpd
-		tcpdump
-		tcsh
-		telnet
-		terminfo
-		timezone
-		ulimit
-		usbutils
-		utempter
-		vim
-		wdiff
-		wget
-		wvstreams
-		xfsprogs
-		xinetd
-		xntp
-		yast2-apparmor
-		yast2-backup
-		yast2-bluetooth
-		yast2-bootfloppy
-		yast2-irda
-		yast2-iscsi-client
-		yast2-mail
-		yast2-ncurses
-		yast2-nis-client
-		yast2-ntp-client
-		yast2-online-update-frontend
-		yast2-power-management
-		yast2-powertweak
-		yast2-profile-manager
-		yast2-repair
-		yast2-restore
-		yast2-runlevel
-		yast2-samba-client
-		yast2-scanner
-		yast2-sudo
-		yast2-support
-		yast2-theme-openSUSE
-		yast2-trans-de
-		yast2-tv
-		ypbind
-		zip
-		zisofs-tools
-		zsh
-	END
+    base = minimal
+    packages = <<END
+        acl
+        acpid
+        apparmor-docs
+        apparmor-profiles
+        apparmor-utils
+        ash
+        at
+        atk
+        attr
+        audit
+        autofs
+        autoyast2
+        bc
+        bind-libs
+        bind-utils
+        boost
+        bootsplash-theme-SuSE
+        compat
+        compat-libstdc++
+        compat-openssl097g
+        cpufrequtils
+        cron
+        cups-client
+        cyrus-sasl
+        cyrus-sasl-saslauthd
+        db-utils
+        deltarpm
+        dhcpcd
+        dmraid
+        dos2unix
+        dosfstools
+        ed
+        eject
+        ethtool
+        fbset
+        findutils
+        fontconfig
+        freetype2
+        gdb
+        gdbm
+        glib2
+        glibc-i18ndata
+        gpm
+        hal-resmgr
+        hfsutils
+        ifplugd
+        initviocons
+        inst-source-utils
+        iputils
+        joe
+        kbd
+        kernel-default
+        krb5
+        ksh
+        ksymoops
+        libacl
+        libapparmor
+        libart_lgpl
+        libattr
+        libcap
+        libcom_err
+        libdrm
+        libevent
+        libgcc41
+        libgcrypt
+        libgimpprint
+        libgpg-error
+        libicu
+        libidn
+        libjpeg
+        liblazy
+        liblcms
+        libltdl
+        libmng
+        libnscd
+        libopencdk
+        libpcap
+        libpng
+        librpcsecgss
+        libstdc++41
+        libtiff
+        libusb
+        libvolume_id
+        libxcrypt
+        lukemftp
+        lvm2
+        lzo
+        mailx
+        man
+        man-pages
+        microcode_ctl
+        module-init-tools
+        multipath-tools
+        nbd
+        ncurses
+        net-snmp
+        nfs-utils
+        nfsidmap
+        nscd
+        ntfsprogs
+        openSUSE-release
+        openct
+        opensc
+        openssh
+        openssl
+        patch
+        pax
+        perl-Crypt-SmbHash
+        perl-URI
+        perl-XML-Parser
+        perl-XML-Writer
+        postfix
+        powersave-libs
+        preload
+        procinfo
+        procmail
+        procps
+        providers
+        qlogic-firmware
+        recode
+        rrdtool
+        rsync
+        sash
+        screen
+        scsi
+        sensors
+        sharutils
+        smart
+        smartmontools
+        smpppd
+        squashfs-kmp-default
+        strace
+        sudo
+        suse-build-key
+        suspend
+        sysfsutils
+        syslog-ng
+        tcpd
+        tcpdump
+        tcsh
+        telnet
+        terminfo
+        timezone
+        ulimit
+        usbutils
+        utempter
+        vim
+        wdiff
+        wget
+        wvstreams
+        xfsprogs
+        xinetd
+        xntp
+        yast2-apparmor
+        yast2-backup
+        yast2-bluetooth
+        yast2-bootfloppy
+        yast2-irda
+        yast2-iscsi-client
+        yast2-mail
+        yast2-ncurses
+        yast2-nis-client
+        yast2-ntp-client
+        yast2-online-update-frontend
+        yast2-power-management
+        yast2-powertweak
+        yast2-profile-manager
+        yast2-repair
+        yast2-restore
+        yast2-runlevel
+        yast2-samba-client
+        yast2-scanner
+        yast2-sudo
+        yast2-support
+        yast2-theme-openSUSE
+        yast2-trans-de
+        yast2-tv
+        ypbind
+        zip
+        zisofs-tools
+        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
+    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
+    base = textmode
+    packages = <<END
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
-	
\ No newline at end of file
+    
\ No newline at end of file
diff --git a/lib/distro-info/suse-10.3/settings.example b/lib/distro-info/suse-10.3/settings.example
index ea5469f6..97d663ed 100644
--- a/lib/distro-info/suse-10.3/settings.example
+++ b/lib/distro-info/suse-10.3/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/suse-10.3__x86_64/settings.default b/lib/distro-info/suse-10.3__x86_64/settings.default
index 7fa9e073..8752f736 100644
--- a/lib/distro-info/suse-10.3__x86_64/settings.default
+++ b/lib/distro-info/suse-10.3__x86_64/settings.default
@@ -1,973 +1,973 @@
 bootstrap-packages = <<END
 END
 <metapackager smart>
-	packages = <<END
-	END
+    packages = <<END
+    END
 </metapackager>
 <metapackager yum>
-	packages = <<END
-	END
+    packages = <<END
+    END
 </metapackager>
 package-subdir = suse
 prereq-packages = <<END
 END
 <repository base>
-	name = openSUSE 10.3
-	repo-subdir = suse
-	file-for-speedtest = suse/setup/descr/packages.en
+    name = openSUSE 10.3
+    repo-subdir = suse
+    file-for-speedtest = suse/setup/descr/packages.en
 </repository>
 <repository base_non-oss>
-	name = openSUSE 10.3 non-OSS
-	repo-subdir = suse
-	file-for-speedtest = suse/setup/descr/packages.en
+    name = openSUSE 10.3 non-OSS
+    repo-subdir = suse
+    file-for-speedtest = suse/setup/descr/packages.en
 </repository>
 <repository base_update>
-	name = openSUSE 10.3 updates
-	file-for-speedtest = repodata/primary.xml.gz
+    name = openSUSE 10.3 updates
+    file-for-speedtest = repodata/primary.xml.gz
 </repository>
 <selection minimal>
-	packages = <<END
-		glibc-locale
-	END
+    packages = <<END
+        glibc-locale
+    END
 </selection>
 <selection textmode>
-	base = minimal
-	packages = <<END
-		acl
-		acpid
-		apparmor-docs
-		apparmor-profiles
-		apparmor-utils
-		ash
-		at
-		atk
-		attr
-		audit
-		autofs
-		autoyast2
-		bc
-		bind-libs
-		bind-utils
-		boost
-		bootsplash-theme-SuSE
-		compat
-		compat-libstdc++
-		compat-openssl097g
-		cpufrequtils
-		cron
-		cups-client
-		cyrus-sasl
-		cyrus-sasl-saslauthd
-		db-utils
-		deltarpm
-		dhcpcd
-		dmraid
-		dos2unix
-		dosfstools
-		ed
-		eject
-		ethtool
-		fbset
-		findutils
-		fontconfig
-		freetype2
-		gdb
-		gdbm
-		glib2
-		glibc-i18ndata
-		gpm
-		hal-resmgr
-		hfsutils
-		ifplugd
-		initviocons
-		inst-source-utils
-		iputils
-		joe
-		kbd
-		kernel-default
-		krb5
-		ksh
-		ksymoops
-		libacl
-		libapparmor
-		libart_lgpl
-		libattr
-		libcap
-		libcom_err
-		libdrm
-		libevent
-		libgcc41
-		libgcrypt
-		libgimpprint
-		libgpg-error
-		libicu
-		libidn
-		libjpeg
-		liblazy
-		liblcms
-		libltdl
-		libmng
-		libnscd
-		libopencdk
-		libpcap
-		libpng
-		librpcsecgss
-		libstdc++41
-		libtiff
-		libusb
-		libvolume_id
-		libxcrypt
-		lukemftp
-		lvm2
-		lzo
-		mailx
-		man
-		man-pages
-		microcode_ctl
-		module-init-tools
-		multipath-tools
-		nbd
-		ncurses
-		net-snmp
-		nfs-utils
-		nfsidmap
-		nscd
-		ntfsprogs
-		openSUSE-release
-		openct
-		opensc
-		openssh
-		openssl
-		patch
-		pax
-		perl-Crypt-SmbHash
-		perl-URI
-		perl-XML-Parser
-		perl-XML-Writer
-		postfix
-		powersave-libs
-		preload
-		procinfo
-		procmail
-		procps
-		providers
-		qlogic-firmware
-		recode
-		rrdtool
-		rsync
-		sash
-		screen
-		scsi
-		sensors
-		sharutils
-		smart
-		smartmontools
-		smpppd
-		squashfs-kmp-default
-		strace
-		sudo
-		suse-build-key
-		suspend
-		sysfsutils
-		syslog-ng
-		tcpd
-		tcpdump
-		tcsh
-		telnet
-		terminfo
-		timezone
-		ulimit
-		usbutils
-		utempter
-		vim
-		wdiff
-		wget
-		wvstreams
-		xfsprogs
-		xinetd
-		xntp
-		yast2-apparmor
-		yast2-backup
-		yast2-bluetooth
-		yast2-bootfloppy
-		yast2-irda
-		yast2-iscsi-client
-		yast2-mail
-		yast2-ncurses
-		yast2-nis-client
-		yast2-ntp-client
-		yast2-online-update-frontend
-		yast2-power-management
-		yast2-powertweak
-		yast2-profile-manager
-		yast2-repair
-		yast2-restore
-		yast2-runlevel
-		yast2-samba-client
-		yast2-scanner
-		yast2-sudo
-		yast2-support
-		yast2-theme-openSUSE
-		yast2-trans-de
-		yast2-tv
-		ypbind
-		zip
-		zisofs-tools
-		zsh
-	END
+    base = minimal
+    packages = <<END
+        acl
+        acpid
+        apparmor-docs
+        apparmor-profiles
+        apparmor-utils
+        ash
+        at
+        atk
+        attr
+        audit
+        autofs
+        autoyast2
+        bc
+        bind-libs
+        bind-utils
+        boost
+        bootsplash-theme-SuSE
+        compat
+        compat-libstdc++
+        compat-openssl097g
+        cpufrequtils
+        cron
+        cups-client
+        cyrus-sasl
+        cyrus-sasl-saslauthd
+        db-utils
+        deltarpm
+        dhcpcd
+        dmraid
+        dos2unix
+        dosfstools
+        ed
+        eject
+        ethtool
+        fbset
+        findutils
+        fontconfig
+        freetype2
+        gdb
+        gdbm
+        glib2
+        glibc-i18ndata
+        gpm
+        hal-resmgr
+        hfsutils
+        ifplugd
+        initviocons
+        inst-source-utils
+        iputils
+        joe
+        kbd
+        kernel-default
+        krb5
+        ksh
+        ksymoops
+        libacl
+        libapparmor
+        libart_lgpl
+        libattr
+        libcap
+        libcom_err
+        libdrm
+        libevent
+        libgcc41
+        libgcrypt
+        libgimpprint
+        libgpg-error
+        libicu
+        libidn
+        libjpeg
+        liblazy
+        liblcms
+        libltdl
+        libmng
+        libnscd
+        libopencdk
+        libpcap
+        libpng
+        librpcsecgss
+        libstdc++41
+        libtiff
+        libusb
+        libvolume_id
+        libxcrypt
+        lukemftp
+        lvm2
+        lzo
+        mailx
+        man
+        man-pages
+        microcode_ctl
+        module-init-tools
+        multipath-tools
+        nbd
+        ncurses
+        net-snmp
+        nfs-utils
+        nfsidmap
+        nscd
+        ntfsprogs
+        openSUSE-release
+        openct
+        opensc
+        openssh
+        openssl
+        patch
+        pax
+        perl-Crypt-SmbHash
+        perl-URI
+        perl-XML-Parser
+        perl-XML-Writer
+        postfix
+        powersave-libs
+        preload
+        procinfo
+        procmail
+        procps
+        providers
+        qlogic-firmware
+        recode
+        rrdtool
+        rsync
+        sash
+        screen
+        scsi
+        sensors
+        sharutils
+        smart
+        smartmontools
+        smpppd
+        squashfs-kmp-default
+        strace
+        sudo
+        suse-build-key
+        suspend
+        sysfsutils
+        syslog-ng
+        tcpd
+        tcpdump
+        tcsh
+        telnet
+        terminfo
+        timezone
+        ulimit
+        usbutils
+        utempter
+        vim
+        wdiff
+        wget
+        wvstreams
+        xfsprogs
+        xinetd
+        xntp
+        yast2-apparmor
+        yast2-backup
+        yast2-bluetooth
+        yast2-bootfloppy
+        yast2-irda
+        yast2-iscsi-client
+        yast2-mail
+        yast2-ncurses
+        yast2-nis-client
+        yast2-ntp-client
+        yast2-online-update-frontend
+        yast2-power-management
+        yast2-powertweak
+        yast2-profile-manager
+        yast2-repair
+        yast2-restore
+        yast2-runlevel
+        yast2-samba-client
+        yast2-scanner
+        yast2-sudo
+        yast2-support
+        yast2-theme-openSUSE
+        yast2-trans-de
+        yast2-tv
+        ypbind
+        zip
+        zisofs-tools
+        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
+    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
+    base = textmode
+    packages = <<END
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/suse-10.3__x86_64/settings.example b/lib/distro-info/suse-10.3__x86_64/settings.example
index c32b0514..2905cef4 100644
--- a/lib/distro-info/suse-10.3__x86_64/settings.example
+++ b/lib/distro-info/suse-10.3__x86_64/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/ubuntu-6.10/settings.default b/lib/distro-info/ubuntu-6.10/settings.default
index 0b183976..7a23c243 100644
--- a/lib/distro-info/ubuntu-6.10/settings.default
+++ b/lib/distro-info/ubuntu-6.10/settings.default
@@ -3,50 +3,50 @@ package-subdir = pool
 prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb
 release-name = edgy
 <repository base>
-	components = main restricted
-	distribution = edgy
-	name = Ubuntu 6.10
-	repo-subdir = dists
-	file-for-speedtest = dists/edgy/main/binary-i386/Packages.bz2
+    components = main restricted
+    distribution = edgy
+    name = Ubuntu 6.10
+    repo-subdir = dists
+    file-for-speedtest = dists/edgy/main/binary-i386/Packages.bz2
 </repository>
 <repository base_security>
-	components = main restricted
-	distribution = edgy-security
-	name = Ubuntu 6.10 Security
-	repo-subdir = dists
-	file-for-speedtest = dists/edgy-security/main/binary-i386/Packages.bz2
+    components = main restricted
+    distribution = edgy-security
+    name = Ubuntu 6.10 Security
+    repo-subdir = dists
+    file-for-speedtest = dists/edgy-security/main/binary-i386/Packages.bz2
 </repository>
 <repository base_updates>
-	components = main restricted
-	distribution = edgy-updates
-	name = Ubuntu 6.10 Updates
-	repo-subdir = dists
-	file-for-speedtest = dists/edgy-updates/main/binary-i386/Packages.bz2
+    components = main restricted
+    distribution = edgy-updates
+    name = Ubuntu 6.10 Updates
+    repo-subdir = dists
+    file-for-speedtest = dists/edgy-updates/main/binary-i386/Packages.bz2
 </repository>
 <selection minimal>
-	packages = <<END
-		language-pack-de
-		linux-image-generic
-	END
+    packages = <<END
+        language-pack-de
+        linux-image-generic
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		ubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        ubuntu-desktop
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-		kubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        kubuntu-desktop
+    END
 </selection>
 <selection xfce>
-	base = minimal
-	packages = <<END
-		xubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        xubuntu-desktop
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/ubuntu-6.10/settings.example b/lib/distro-info/ubuntu-6.10/settings.example
index ac02e5b4..31881c4c 100644
--- a/lib/distro-info/ubuntu-6.10/settings.example
+++ b/lib/distro-info/ubuntu-6.10/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/ubuntu-6.10_amd64/settings.default b/lib/distro-info/ubuntu-6.10_amd64/settings.default
index 9b91cf56..0c68826b 100644
--- a/lib/distro-info/ubuntu-6.10_amd64/settings.default
+++ b/lib/distro-info/ubuntu-6.10_amd64/settings.default
@@ -3,50 +3,50 @@ package-subdir = pool
 prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb
 release-name = edgy
 <repository base>
-	components = main restricted
-	distribution = edgy
-	name = Ubuntu 6.10
-	repo-subdir = dists
-	file-for-speedtest = dists/edgy/main/binary-amd64/Packages.bz2
+    components = main restricted
+    distribution = edgy
+    name = Ubuntu 6.10
+    repo-subdir = dists
+    file-for-speedtest = dists/edgy/main/binary-amd64/Packages.bz2
 </repository>
 <repository base_security>
-	components = main restricted
-	distribution = edgy-security
-	name = Ubuntu 6.10 Security
-	repo-subdir = dists
-	file-for-speedtest = dists/edgy-security/main/binary-amd64/Packages.bz2
+    components = main restricted
+    distribution = edgy-security
+    name = Ubuntu 6.10 Security
+    repo-subdir = dists
+    file-for-speedtest = dists/edgy-security/main/binary-amd64/Packages.bz2
 </repository>
 <repository base_updates>
-	components = main restricted
-	distribution = edgy-updates
-	name = Ubuntu 6.10 Updates
-	repo-subdir = dists
-	file-for-speedtest = dists/edgy-updates/main/binary-amd64/Packages.bz2
+    components = main restricted
+    distribution = edgy-updates
+    name = Ubuntu 6.10 Updates
+    repo-subdir = dists
+    file-for-speedtest = dists/edgy-updates/main/binary-amd64/Packages.bz2
 </repository>
 <selection minimal>
-	packages = <<END
-		language-pack-de
-		linux-image-generic
-	END
+    packages = <<END
+        language-pack-de
+        linux-image-generic
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		ubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        ubuntu-desktop
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-		kubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        kubuntu-desktop
+    END
 </selection>
 <selection xfce>
-	base = minimal
-	packages = <<END
-		xubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        xubuntu-desktop
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/ubuntu-6.10_amd64/settings.example b/lib/distro-info/ubuntu-6.10_amd64/settings.example
index ac02e5b4..31881c4c 100644
--- a/lib/distro-info/ubuntu-6.10_amd64/settings.example
+++ b/lib/distro-info/ubuntu-6.10_amd64/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/ubuntu-7.04/settings.default b/lib/distro-info/ubuntu-7.04/settings.default
index 4e83d0da..771c8802 100644
--- a/lib/distro-info/ubuntu-7.04/settings.default
+++ b/lib/distro-info/ubuntu-7.04/settings.default
@@ -3,50 +3,50 @@ package-subdir = pool
 prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb
 release-name = feisty
 <repository base>
-	components = main restricted
-	distribution = feisty
-	name = Ubuntu 7.04
-	repo-subdir = dists
-	file-for-speedtest = dists/feisty/main/binary-i386/Packages.bz2
+    components = main restricted
+    distribution = feisty
+    name = Ubuntu 7.04
+    repo-subdir = dists
+    file-for-speedtest = dists/feisty/main/binary-i386/Packages.bz2
 </repository>
 <repository base_security>
-	components = main restricted
-	distribution = feisty-security
-	name = Ubuntu 7.04 Security
-	repo-subdir = dists
-	file-for-speedtest = dists/feisty-security/main/binary-i386/Packages.bz2
+    components = main restricted
+    distribution = feisty-security
+    name = Ubuntu 7.04 Security
+    repo-subdir = dists
+    file-for-speedtest = dists/feisty-security/main/binary-i386/Packages.bz2
 </repository>
 <repository base_updates>
-	components = main restricted
-	distribution = feisty-updates
-	name = Ubuntu 7.04 Updates
-	repo-subdir = dists
-	file-for-speedtest = dists/feisty-updates/main/binary-i386/Packages.bz2
+    components = main restricted
+    distribution = feisty-updates
+    name = Ubuntu 7.04 Updates
+    repo-subdir = dists
+    file-for-speedtest = dists/feisty-updates/main/binary-i386/Packages.bz2
 </repository>
 <selection minimal>
-	packages = <<END
-		language-pack-de
-		linux-image-generic
-	END
+    packages = <<END
+        language-pack-de
+        linux-image-generic
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		ubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        ubuntu-desktop
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-		kubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        kubuntu-desktop
+    END
 </selection>
 <selection xfce>
-	base = minimal
-	packages = <<END
-		xubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        xubuntu-desktop
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/ubuntu-7.04/settings.example b/lib/distro-info/ubuntu-7.04/settings.example
index ac02e5b4..31881c4c 100644
--- a/lib/distro-info/ubuntu-7.04/settings.example
+++ b/lib/distro-info/ubuntu-7.04/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/ubuntu-7.04_amd64/settings.default b/lib/distro-info/ubuntu-7.04_amd64/settings.default
index 461c8e3d..24567542 100644
--- a/lib/distro-info/ubuntu-7.04_amd64/settings.default
+++ b/lib/distro-info/ubuntu-7.04_amd64/settings.default
@@ -3,50 +3,50 @@ package-subdir = pool
 prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb
 release-name = feisty
 <repository base>
-	components = main restricted
-	distribution = feisty
-	name = Ubuntu 7.04
-	repo-subdir = dists
-	file-for-speedtest = dists/feisty/main/binary-amd64/Packages.bz2
+    components = main restricted
+    distribution = feisty
+    name = Ubuntu 7.04
+    repo-subdir = dists
+    file-for-speedtest = dists/feisty/main/binary-amd64/Packages.bz2
 </repository>
 <repository base_security>
-	components = main restricted
-	distribution = feisty-security
-	name = Ubuntu 7.04 Security
-	repo-subdir = dists
-	file-for-speedtest = dists/feisty-security/main/binary-amd64/Packages.bz2
+    components = main restricted
+    distribution = feisty-security
+    name = Ubuntu 7.04 Security
+    repo-subdir = dists
+    file-for-speedtest = dists/feisty-security/main/binary-amd64/Packages.bz2
 </repository>
 <repository base_updates>
-	components = main restricted
-	distribution = feisty-updates
-	name = Ubuntu 7.04 Updates
-	repo-subdir = dists
-	file-for-speedtest = dists/feisty-updates/main/binary-amd64/Packages.bz2
+    components = main restricted
+    distribution = feisty-updates
+    name = Ubuntu 7.04 Updates
+    repo-subdir = dists
+    file-for-speedtest = dists/feisty-updates/main/binary-amd64/Packages.bz2
 </repository>
 <selection minimal>
-	packages = <<END
-		language-pack-de
-		linux-image-generic
-	END
+    packages = <<END
+        language-pack-de
+        linux-image-generic
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		ubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        ubuntu-desktop
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-		kubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        kubuntu-desktop
+    END
 </selection>
 <selection xfce>
-	base = minimal
-	packages = <<END
-		xubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        xubuntu-desktop
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/ubuntu-7.04_amd64/settings.example b/lib/distro-info/ubuntu-7.04_amd64/settings.example
index ac02e5b4..31881c4c 100644
--- a/lib/distro-info/ubuntu-7.04_amd64/settings.example
+++ b/lib/distro-info/ubuntu-7.04_amd64/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/ubuntu-7.10/settings.default b/lib/distro-info/ubuntu-7.10/settings.default
index 4e5757f7..de7fa076 100644
--- a/lib/distro-info/ubuntu-7.10/settings.default
+++ b/lib/distro-info/ubuntu-7.10/settings.default
@@ -3,50 +3,50 @@ package-subdir = pool
 prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb
 release-name = gutsy
 <repository base>
-	components = main restricted
-	distribution = gutsy
-	name = Ubuntu 7.10
-	repo-subdir = dists
-	file-for-speedtest = dists/gutsy/main/binary-i386/Packages.bz2
+    components = main restricted
+    distribution = gutsy
+    name = Ubuntu 7.10
+    repo-subdir = dists
+    file-for-speedtest = dists/gutsy/main/binary-i386/Packages.bz2
 </repository>
 <repository base_security>
-	components = main restricted
-	distribution = gutsy-security
-	name = Ubuntu 7.10 Security
-	repo-subdir = dists
-	file-for-speedtest = dists/gutsy-security/main/binary-i386/Packages.bz2
+    components = main restricted
+    distribution = gutsy-security
+    name = Ubuntu 7.10 Security
+    repo-subdir = dists
+    file-for-speedtest = dists/gutsy-security/main/binary-i386/Packages.bz2
 </repository>
 <repository base_updates>
-	components = main restricted
-	distribution = gutsy-updates
-	name = Ubuntu 7.10 Updates
-	repo-subdir = dists
-	file-for-speedtest = dists/gutsy-updates/main/binary-i386/Packages.bz2
+    components = main restricted
+    distribution = gutsy-updates
+    name = Ubuntu 7.10 Updates
+    repo-subdir = dists
+    file-for-speedtest = dists/gutsy-updates/main/binary-i386/Packages.bz2
 </repository>
 <selection minimal>
-	packages = <<END
-		language-pack-de
-		linux-image-generic
-	END
+    packages = <<END
+        language-pack-de
+        linux-image-generic
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		ubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        ubuntu-desktop
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-		kubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        kubuntu-desktop
+    END
 </selection>
 <selection xfce>
-	base = minimal
-	packages = <<END
-		xubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        xubuntu-desktop
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/ubuntu-7.10/settings.example b/lib/distro-info/ubuntu-7.10/settings.example
index ac02e5b4..31881c4c 100644
--- a/lib/distro-info/ubuntu-7.10/settings.example
+++ b/lib/distro-info/ubuntu-7.10/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/ubuntu-7.10_amd64/settings.default b/lib/distro-info/ubuntu-7.10_amd64/settings.default
index 9b01f01d..289a4ae5 100644
--- a/lib/distro-info/ubuntu-7.10_amd64/settings.default
+++ b/lib/distro-info/ubuntu-7.10_amd64/settings.default
@@ -3,50 +3,50 @@ package-subdir = pool
 prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb
 release-name = gutsy
 <repository base>
-	components = main restricted
-	distribution = gutsy
-	name = Ubuntu 7.10
-	repo-subdir = dists
-	file-for-speedtest = dists/gutsy/main/binary-amd64/Packages.bz2
+    components = main restricted
+    distribution = gutsy
+    name = Ubuntu 7.10
+    repo-subdir = dists
+    file-for-speedtest = dists/gutsy/main/binary-amd64/Packages.bz2
 </repository>
 <repository base_security>
-	components = main restricted
-	distribution = gutsy-security
-	name = Ubuntu 7.10 Security
-	repo-subdir = dists
-	file-for-speedtest = dists/gutsy-security/main/binary-amd64/Packages.bz2
+    components = main restricted
+    distribution = gutsy-security
+    name = Ubuntu 7.10 Security
+    repo-subdir = dists
+    file-for-speedtest = dists/gutsy-security/main/binary-amd64/Packages.bz2
 </repository>
 <repository base_updates>
-	components = main restricted
-	distribution = gutsy-updates
-	name = Ubuntu 7.10 Updates
-	repo-subdir = dists
-	file-for-speedtest = dists/gutsy-updates/main/binary-amd64/Packages.bz2
+    components = main restricted
+    distribution = gutsy-updates
+    name = Ubuntu 7.10 Updates
+    repo-subdir = dists
+    file-for-speedtest = dists/gutsy-updates/main/binary-amd64/Packages.bz2
 </repository>
 <selection minimal>
-	packages = <<END
-		language-pack-de
-		linux-image-generic
-	END
+    packages = <<END
+        language-pack-de
+        linux-image-generic
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		ubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        ubuntu-desktop
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-		kubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        kubuntu-desktop
+    END
 </selection>
 <selection xfce>
-	base = minimal
-	packages = <<END
-		xubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        xubuntu-desktop
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/ubuntu-7.10_amd64/settings.example b/lib/distro-info/ubuntu-7.10_amd64/settings.example
index ac02e5b4..31881c4c 100644
--- a/lib/distro-info/ubuntu-7.10_amd64/settings.example
+++ b/lib/distro-info/ubuntu-7.10_amd64/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/ubuntu-8.04/settings.default b/lib/distro-info/ubuntu-8.04/settings.default
index 217a46e7..a6c606c5 100644
--- a/lib/distro-info/ubuntu-8.04/settings.default
+++ b/lib/distro-info/ubuntu-8.04/settings.default
@@ -3,50 +3,50 @@ package-subdir = pool
 prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb
 release-name = hardy
 <repository base>
-	components = main restricted
-	distribution = hardy
-	name = Ubuntu 8.04
-	repo-subdir = dists
-	file-for-speedtest = dists/hardy/main/binary-i386/Packages.bz2
+    components = main restricted
+    distribution = hardy
+    name = Ubuntu 8.04
+    repo-subdir = dists
+    file-for-speedtest = dists/hardy/main/binary-i386/Packages.bz2
 </repository>
 <repository base_security>
-	components = main restricted
-	distribution = hardy-security
-	name = Ubuntu 8.04 Security
-	repo-subdir = dists
-	file-for-speedtest = dists/hardy-security/main/binary-i386/Packages.bz2
+    components = main restricted
+    distribution = hardy-security
+    name = Ubuntu 8.04 Security
+    repo-subdir = dists
+    file-for-speedtest = dists/hardy-security/main/binary-i386/Packages.bz2
 </repository>
 <repository base_updates>
-	components = main restricted
-	distribution = hardy-updates
-	name = Ubuntu 8.04 Updates
-	repo-subdir = dists
-	file-for-speedtest = dists/hardy-updates/main/binary-i386/Packages.bz2
+    components = main restricted
+    distribution = hardy-updates
+    name = Ubuntu 8.04 Updates
+    repo-subdir = dists
+    file-for-speedtest = dists/hardy-updates/main/binary-i386/Packages.bz2
 </repository>
 <selection minimal>
-	packages = <<END
-		language-pack-de
-		linux-image-generic
-	END
+    packages = <<END
+        language-pack-de
+        linux-image-generic
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		ubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        ubuntu-desktop
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-		kubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        kubuntu-desktop
+    END
 </selection>
 <selection xfce>
-	base = minimal
-	packages = <<END
-		xubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        xubuntu-desktop
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/ubuntu-8.04/settings.example b/lib/distro-info/ubuntu-8.04/settings.example
index ac02e5b4..31881c4c 100644
--- a/lib/distro-info/ubuntu-8.04/settings.example
+++ b/lib/distro-info/ubuntu-8.04/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>
diff --git a/lib/distro-info/ubuntu-8.04_amd64/settings.default b/lib/distro-info/ubuntu-8.04_amd64/settings.default
index ce329008..338a4514 100644
--- a/lib/distro-info/ubuntu-8.04_amd64/settings.default
+++ b/lib/distro-info/ubuntu-8.04_amd64/settings.default
@@ -3,50 +3,50 @@ package-subdir = pool
 prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb
 release-name = hardy
 <repository base>
-	components = main restricted
-	distribution = hardy
-	name = Ubuntu 8.04
-	repo-subdir = dists
-	file-for-speedtest = dists/hardy/main/binary-amd64/Packages.bz2
+    components = main restricted
+    distribution = hardy
+    name = Ubuntu 8.04
+    repo-subdir = dists
+    file-for-speedtest = dists/hardy/main/binary-amd64/Packages.bz2
 </repository>
 <repository base_security>
-	components = main restricted
-	distribution = hardy-security
-	name = Ubuntu 8.04 Security
-	repo-subdir = dists
-	file-for-speedtest = dists/hardy-security/main/binary-amd64/Packages.bz2
+    components = main restricted
+    distribution = hardy-security
+    name = Ubuntu 8.04 Security
+    repo-subdir = dists
+    file-for-speedtest = dists/hardy-security/main/binary-amd64/Packages.bz2
 </repository>
 <repository base_updates>
-	components = main restricted
-	distribution = hardy-updates
-	name = Ubuntu 8.04 Updates
-	repo-subdir = dists
-	file-for-speedtest = dists/hardy-updates/main/binary-amd64/Packages.bz2
+    components = main restricted
+    distribution = hardy-updates
+    name = Ubuntu 8.04 Updates
+    repo-subdir = dists
+    file-for-speedtest = dists/hardy-updates/main/binary-amd64/Packages.bz2
 </repository>
 <selection minimal>
-	packages = <<END
-		language-pack-de
-		linux-image-generic
-	END
+    packages = <<END
+        language-pack-de
+        linux-image-generic
+    END
 </selection>
 <selection gnome>
-	base = minimal
-	packages = <<END
-		ubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        ubuntu-desktop
+    END
 </selection>
 <selection kde>
-	base = minimal
-	packages = <<END
-		kubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        kubuntu-desktop
+    END
 </selection>
 <selection xfce>
-	base = minimal
-	packages = <<END
-		xubuntu-desktop
-	END
+    base = minimal
+    packages = <<END
+        xubuntu-desktop
+    END
 </selection>
 <selection default>
-	base = minimal
+    base = minimal
 </selection>
diff --git a/lib/distro-info/ubuntu-8.04_amd64/settings.example b/lib/distro-info/ubuntu-8.04_amd64/settings.example
index ac02e5b4..31881c4c 100644
--- a/lib/distro-info/ubuntu-8.04_amd64/settings.example
+++ b/lib/distro-info/ubuntu-8.04_amd64/settings.example
@@ -16,8 +16,8 @@
 
 # add a new selection:
 #<selection my_kde>
-#	base = kde
-#	packages = <<END
-#		kinternet
-#	END
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
 #</selection>