diff options
37 files changed, 972 insertions, 91 deletions
diff --git a/installer/OpenSLX/OSSetup/Distro/Debian.pm b/installer/OpenSLX/OSSetup/Distro/Debian.pm index e430abd4..a514f10f 100644 --- a/installer/OpenSLX/OSSetup/Distro/Debian.pm +++ b/installer/OpenSLX/OSSetup/Distro/Debian.pm @@ -80,8 +80,9 @@ sub preSystemInstallationHook # replace /usr/sbin/invoke-rc.d by a dummy, in order to avoid a whole lot # of initscripts being started. Wishful thinking: there should be another - # way to stop Ubuntu from doing this, as this is not really very supportive - # of folder-based installations ... + # way to stop Debian from doing this, as this is not really very supportive + # of folder-based installations (then again: I may simply be too stupid + # to find out how it is supposed to work ...) rename('/usr/sbin/invoke-rc.d', '/usr/sbin/_invoke-rc.d'); spitFile('/usr/sbin/invoke-rc.d', "#! /bin/sh\nexit 0\n"); chmod 0755, '/usr/sbin/invoke-rc.d'; diff --git a/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm b/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm index 029c35c3..4ab5abbc 100644 --- a/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm +++ b/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm @@ -81,7 +81,8 @@ sub preSystemInstallationHook # replace /usr/sbin/invoke-rc.d by a dummy, in order to avoid a whole lot # of initscripts being started. Wishful thinking: there should be another # way to stop Ubuntu from doing this, as this is not really very supportive - # of folder-based installations ... + # of folder-based installations (then again: I may simply be too stupid + # to find out how it is supposed to work ...) rename('/usr/sbin/invoke-rc.d', '/usr/sbin/_invoke-rc.d'); spitFile('/usr/sbin/invoke-rc.d', "#! /bin/sh\nexit 0\n"); chmod 0755, '/usr/sbin/invoke-rc.d'; diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index 42a1923f..9b2c6aba 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -700,8 +700,9 @@ sub _readDistroInfo } # expand all selections: + my $seen = {}; foreach my $selKey (keys %{$self->{'distro-info'}->{selection}}) { - $self->_expandSelection($selKey); + $self->_expandSelection($selKey, $seen); } # dump distro-info, if asked for: @@ -942,7 +943,7 @@ sub _expandSelection { my $self = shift; my $selKey = shift; - my $seen = shift || {}; + my $seen = shift; return if $seen->{$selKey}; $seen->{$selKey} = 1; @@ -956,8 +957,9 @@ sub _expandSelection return if !exists $self->{'distro-info'}->{selection}->{$base}; my $baseSelection = $self->{'distro-info'}->{selection}->{$base}; $self->_expandSelection($base, $seen); - $selection->{packages} - = "$baseSelection->{packages}\n$selection->{packages}"; + my $packages = $selection->{packages} || ''; + my $basePackages = $baseSelection->{packages} || ''; + $selection->{packages} = $basePackages . "\n" . $packages; } return; } @@ -1406,10 +1408,6 @@ sub _stage1C_chrootAndInstallBasicVendorOS $self->{packager}->importTrustedPackageKeys(\@keyFiles, $stage1cDir); } - # install prerequired packages (if distro requires it) - $self->{packager}->installPrerequiredPackages( - $self->{'prereq-packages'}, $stage1cDir - ); # install bootstrap packages $self->{packager}->installPackages( $self->{'bootstrap-packages'}, $stage1cDir diff --git a/installer/OpenSLX/OSSetup/Packager/Base.pm b/installer/OpenSLX/OSSetup/Packager/Base.pm index c33b690b..55211183 100644 --- a/installer/OpenSLX/OSSetup/Packager/Base.pm +++ b/installer/OpenSLX/OSSetup/Packager/Base.pm @@ -49,10 +49,6 @@ sub importTrustedPackageKeys { } -sub installPrerequiredPackages -{ -} - sub installPackages { } diff --git a/installer/OpenSLX/OSSetup/Packager/rpm.pm b/installer/OpenSLX/OSSetup/Packager/rpm.pm index 0fd502a0..db1e7e1f 100644 --- a/installer/OpenSLX/OSSetup/Packager/rpm.pm +++ b/installer/OpenSLX/OSSetup/Packager/rpm.pm @@ -40,9 +40,7 @@ sub bootstrap foreach my $pkg (@$pkgs) { vlog(2, "unpacking package $pkg..."); if (slxsystem("ash", "-c", "rpm2cpio $pkg | cpio -i -d -u")) { - warn _tr("unable to unpack package <%s> (%s)", $pkg, $!); - # TODO: change this back to die() if cpio-ing fedora6-glibc - # doesn't crash anymore... (needs busybox update, I suppose) + die _tr("unable to unpack package <%s> (%s)", $pkg, $!); } } return; @@ -65,22 +63,6 @@ sub importTrustedPackageKeys return; } -sub installPrerequiredPackages -{ - my $self = shift; - my $pkgs = shift; - my $finalPath = shift; - - return unless defined $pkgs && scalar(@$pkgs); - - if (slxsystem("rpm", "--root=$finalPath", "-ivh", "--nodeps", "--noscripts", - "--force", @$pkgs)) { - die _tr("error during prerequired-package-installation (%s)\n", $!); - } - slxsystem("rm", "-rf", "$finalPath/var/lib/rpm"); - return; -} - sub installPackages { my $self = shift; diff --git a/lib/distro-info/debian-3.1/settings.default b/lib/distro-info/debian-3.1/settings.default index 0796987e..9af7d3ef 100644 --- a/lib/distro-info/debian-3.1/settings.default +++ b/lib/distro-info/debian-3.1/settings.default @@ -9,26 +9,29 @@ release-name = sarge repo-subdir = dists file-for-speedtest = dists/sarge/main/binary-i386/Packages.gz </repository> -<selection default> +<selection minimal> packages = <<END kernel-image-2.6-386 locales END </selection> <selection gnome> - base = default + base = minimal packages = <<END gnome END </selection> <selection kde> - base = default + base = minimal packages = <<END kde END </selection> +<selection default> + base = minimal +</selection> <selection openslx-build> - base = default + base = minimal packages = <<END bzip2 gcc diff --git a/lib/distro-info/debian-3.1/settings.example b/lib/distro-info/debian-3.1/settings.example index e4436bed..d09a8710 100644 --- a/lib/distro-info/debian-3.1/settings.example +++ b/lib/distro-info/debian-3.1/settings.example @@ -14,3 +14,4 @@ # 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 679eb6ae..9ec54e23 100644 --- a/lib/distro-info/debian-4.0/settings.default +++ b/lib/distro-info/debian-4.0/settings.default @@ -9,21 +9,24 @@ release-name = etch repo-subdir = dists file-for-speedtest = dists/etch/main/binary-i386/Packages.bz2 </repository> -<selection default> +<selection minimal> packages = <<END linux-image-486 locales-all END </selection> <selection gnome> - base = default + base = minimal packages = <<END gnome END </selection> <selection kde> - base = default + base = minimal packages = <<END kde END </selection> +<selection default> + base = minimal +</selection> diff --git a/lib/distro-info/debian-4.0/settings.example b/lib/distro-info/debian-4.0/settings.example index e4436bed..d09a8710 100644 --- a/lib/distro-info/debian-4.0/settings.example +++ b/lib/distro-info/debian-4.0/settings.example @@ -14,3 +14,4 @@ # 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 2107c55d..be46fe14 100644 --- a/lib/distro-info/debian-4.0_amd64/settings.default +++ b/lib/distro-info/debian-4.0_amd64/settings.default @@ -9,26 +9,29 @@ release-name = etch repo-subdir = dists file-for-speedtest = dists/etch/main/binary-amd64/Packages.bz2 </repository> -<selection default> +<selection minimal> packages = <<END linux-image-amd64 locales-all END </selection> <selection gnome> - base = default + base = minimal packages = <<END gnome END </selection> <selection kde> - base = default + base = minimal packages = <<END kde END </selection> +<selection default> + base = minimal +</selection> <selection openslx-build> - base = default + base = minimal packages = <<END bzip2 gcc diff --git a/lib/distro-info/debian-4.0_amd64/settings.example b/lib/distro-info/debian-4.0_amd64/settings.example index e4436bed..d09a8710 100644 --- a/lib/distro-info/debian-4.0_amd64/settings.example +++ b/lib/distro-info/debian-4.0_amd64/settings.example @@ -14,3 +14,4 @@ # packages = <<END # kinternet # END +#</selection> diff --git a/lib/distro-info/fedora-6/prereqfiles/etc/hosts b/lib/distro-info/fedora-6/prereqfiles/etc/hosts new file mode 100644 index 00000000..75721cd5 --- /dev/null +++ b/lib/distro-info/fedora-6/prereqfiles/etc/hosts @@ -0,0 +1 @@ +127.0.0.1 localhost diff --git a/lib/distro-info/fedora-6/settings.default b/lib/distro-info/fedora-6/settings.default index 9433a71a..f49856e9 100644 --- a/lib/distro-info/fedora-6/settings.default +++ b/lib/distro-info/fedora-6/settings.default @@ -2,6 +2,8 @@ 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 @@ -11,7 +13,10 @@ bootstrap-packages = <<END 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 @@ -19,6 +24,7 @@ bootstrap-packages = <<END 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 @@ -28,10 +34,15 @@ bootstrap-packages = <<END 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 @@ -42,16 +53,22 @@ bootstrap-packages = <<END 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 @@ -59,14 +76,19 @@ bootstrap-packages = <<END tzdata-2006m-2.fc6.noarch.rpm udev-095-14.i386.rpm util-linux-2.13-0.44.fc6.i386.rpm - 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 + 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 +</metapackager> package-subdir = Fedora/RPMS prereq-packages = <<END beecrypt-4.1.2-10.1.1.i386.rpm @@ -81,8 +103,8 @@ prereq-packages = <<END libsepol-1.12.27-1.i386.rpm libstdc++-4.1.1-30.i386.rpm neon-0.25.5-5.1.i386.rpm - popt-1.10.2-32.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 @@ -94,6 +116,10 @@ END <repository base_update> name = Fedora Core 6 updates </repository> +<selection minimal> + packages = <<END + END +</selection> <selection default> - packages = + base = minimal </selection> diff --git a/lib/distro-info/fedora-6/settings.example b/lib/distro-info/fedora-6/settings.example index 15800622..12845311 100644 --- a/lib/distro-info/fedora-6/settings.example +++ b/lib/distro-info/fedora-6/settings.example @@ -17,3 +17,4 @@ # packages = <<END # kinternet # END +#</selection> diff --git a/lib/distro-info/fedora-6_x86_64/prereqfiles/etc/hosts b/lib/distro-info/fedora-6_x86_64/prereqfiles/etc/hosts new file mode 100644 index 00000000..75721cd5 --- /dev/null +++ b/lib/distro-info/fedora-6_x86_64/prereqfiles/etc/hosts @@ -0,0 +1 @@ +127.0.0.1 localhost diff --git a/lib/distro-info/fedora-6_x86_64/settings.default b/lib/distro-info/fedora-6_x86_64/settings.default index cbf2782a..bf97820a 100644 --- a/lib/distro-info/fedora-6_x86_64/settings.default +++ b/lib/distro-info/fedora-6_x86_64/settings.default @@ -2,6 +2,8 @@ bootstrap-packages = <<END audit-libs-1.2.8-1.fc6.x86_64.rpm basesystem-8.0-5.1.1.noarch.rpm bash-3.1-16.1.x86_64.rpm + beecrypt-4.1.2-10.1.1.x86_64.rpm + bzip2-libs-1.0.3-3.x86_64.rpm chkconfig-1.3.30-1.x86_64.rpm coreutils-5.97-11.x86_64.rpm cpio-2.6-19.x86_64.rpm @@ -11,7 +13,10 @@ bootstrap-packages = <<END device-mapper-1.02.07-3.x86_64.rpm dmraid-1.0.0.rc13-1.fc6.x86_64.rpm e2fsprogs-1.39-7.x86_64.rpm + e2fsprogs-libs-1.39-7.x86_64.rpm + elfutils-libelf-0.123-1.fc6.x86_64.rpm ethtool-3-1.2.2.x86_64.rpm + expat-1.95.8-8.2.1.x86_64.rpm fedora-release-6-4.noarch.rpm fedora-release-notes-6-3.noarch.rpm filesystem-2.4.0-1.x86_64.rpm @@ -19,6 +24,7 @@ bootstrap-packages = <<END gawk-3.1.5-11.x86_64.rpm gdbm-1.8.0-26.2.1.x86_64.rpm glib2-2.12.3-2.fc6.x86_64.rpm + glibc-2.5-3.x86_64.rpm glibc-common-2.5-3.x86_64.rpm grep-2.5.1-54.1.x86_64.rpm gzip-1.3.5-9.x86_64.rpm @@ -28,10 +34,15 @@ bootstrap-packages = <<END iputils-20020927-41.fc6.x86_64.rpm kernel-2.6.18-1.2798.fc6.x86_64.rpm kpartx-0.4.7-5.x86_64.rpm + krb5-libs-1.5-7.x86_64.rpm less-394-4.1.x86_64.rpm libacl-2.2.39-1.1.x86_64.rpm libattr-2.4.32-1.1.x86_64.rpm libcap-1.10-25.x86_64.rpm + libgcc-4.1.1-30.x86_64.rpm + libselinux-1.30.29-2.x86_64.rpm + libsepol-1.12.27-1.x86_64.rpm + libstdc++-4.1.1-30.x86_64.rpm libtermcap-2.0.8-46.1.x86_64.rpm lvm2-2.02.06-4.x86_64.rpm MAKEDEV-3.23-1.2.x86_64.rpm @@ -42,16 +53,22 @@ bootstrap-packages = <<END module-init-tools-3.3-0.pre1.4.17.x86_64.rpm nash-5.1.19-1.x86_64.rpm ncurses-5.5-24.20060715.x86_64.rpm + neon-0.25.5-5.1.x86_64.rpm net-tools-1.60-73.x86_64.rpm + openssl-0.9.8b-8.x86_64.rpm pam-0.99.6.2-3.fc6.x86_64.rpm pcre-6.6-1.1.x86_64.rpm + popt-1.10.2-32.x86_64.rpm procps-3.2.7-8.x86_64.rpm psmisc-22.2-5.x86_64.rpm python-2.4.3-18.fc6.x86_64.rpm readline-5.1-1.1.x86_64.rpm + rpm-4.4.2-32.x86_64.rpm + rpm-libs-4.4.2-32.x86_64.rpm sed-4.1.5-5.fc6.x86_64.rpm setup-2.5.55-1.noarch.rpm shadow-utils-4.0.17-5.x86_64.rpm + sqlite-3.3.6-2.x86_64.rpm sysklogd-1.4.1-39.2.x86_64.rpm SysVinit-2.86-14.x86_64.rpm tar-1.15.1-19.x86_64.rpm @@ -59,14 +76,19 @@ bootstrap-packages = <<END tzdata-2006m-2.fc6.noarch.rpm udev-095-14.x86_64.rpm util-linux-2.13-0.44.fc6.x86_64.rpm - libxml2-2.6.26-2.1.1.x86_64.rpm - python-elementtree-1.2.6-5.x86_64.rpm - python-sqlite-1.1.7-1.2.1.x86_64.rpm - python-urlgrabber-2.9.9-2.noarch.rpm - rpm-python-4.4.2-32.x86_64.rpm - yum-3.0-6.noarch.rpm - yum-metadata-parser-1.0-8.fc6.x86_64.rpm + zlib-1.2.3-3.x86_64.rpm END +<metapackager yum> + packages = <<END + libxml2-2.6.26-2.1.1.x86_64.rpm + python-elementtree-1.2.6-5.x86_64.rpm + python-sqlite-1.1.7-1.2.1.x86_64.rpm + python-urlgrabber-2.9.9-2.noarch.rpm + rpm-python-4.4.2-32.x86_64.rpm + yum-3.0-6.noarch.rpm + yum-metadata-parser-1.0-8.fc6.x86_64.rpm + END +</metapackager> package-subdir = Fedora/RPMS prereq-packages = <<END beecrypt-4.1.2-10.1.1.x86_64.rpm @@ -81,8 +103,8 @@ prereq-packages = <<END libsepol-1.12.27-1.x86_64.rpm libstdc++-4.1.1-30.x86_64.rpm neon-0.25.5-5.1.x86_64.rpm - popt-1.10.2-32.x86_64.rpm openssl-0.9.8b-8.x86_64.rpm + popt-1.10.2-32.x86_64.rpm rpm-4.4.2-32.x86_64.rpm rpm-libs-4.4.2-32.x86_64.rpm sqlite-3.3.6-2.x86_64.rpm @@ -94,6 +116,10 @@ END <repository base_update> name = Fedora Core 6 updates </repository> +<selection minimal> + packages = <<END + END +</selection> <selection default> - packages = + base = minimal </selection> diff --git a/lib/distro-info/fedora-6_x86_64/settings.example b/lib/distro-info/fedora-6_x86_64/settings.example index c25f3366..06642225 100644 --- a/lib/distro-info/fedora-6_x86_64/settings.example +++ b/lib/distro-info/fedora-6_x86_64/settings.example @@ -17,3 +17,4 @@ # packages = <<END # kinternet # END +#</selection> diff --git a/lib/distro-info/suse-10.1/prereqfiles/etc/hosts b/lib/distro-info/suse-10.1/prereqfiles/etc/hosts new file mode 100644 index 00000000..75721cd5 --- /dev/null +++ b/lib/distro-info/suse-10.1/prereqfiles/etc/hosts @@ -0,0 +1 @@ +127.0.0.1 localhost diff --git a/lib/distro-info/suse-10.1/settings.default b/lib/distro-info/suse-10.1/settings.default index f194f99b..2a4fdea9 100644 --- a/lib/distro-info/suse-10.1/settings.default +++ b/lib/distro-info/suse-10.1/settings.default @@ -4,6 +4,7 @@ bootstrap-packages = <<END 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 @@ -18,6 +19,7 @@ bootstrap-packages = <<END 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 @@ -52,13 +54,16 @@ bootstrap-packages = <<END 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> @@ -105,13 +110,18 @@ END name = SUSE Linux 10.1 updates file-for-speedtest = repodata/primary.xml.gz </repository> -<selection default> +<selection minimal> packages = <<END glibc-locale END </selection> +<selection kde> + base = minimal + packages = <<END + END +</selection> <selection gnome> - base = default + base = minimal packages = <<END 3ddiag 855resolution @@ -959,3 +969,6 @@ END zvbi END </selection> +<selection default> + base = minimal +</selection> diff --git a/lib/distro-info/suse-10.1/settings.example b/lib/distro-info/suse-10.1/settings.example index 31e1ef17..2c360086 100644 --- a/lib/distro-info/suse-10.1/settings.example +++ b/lib/distro-info/suse-10.1/settings.example @@ -20,3 +20,4 @@ # packages = <<END # kinternet # END +#</selection> diff --git a/lib/distro-info/suse-10.1_x86_64/prereqfiles/etc/hosts b/lib/distro-info/suse-10.1_x86_64/prereqfiles/etc/hosts new file mode 100644 index 00000000..75721cd5 --- /dev/null +++ b/lib/distro-info/suse-10.1_x86_64/prereqfiles/etc/hosts @@ -0,0 +1 @@ +127.0.0.1 localhost 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 5a73fc3c..f40ad5ea 100644 --- a/lib/distro-info/suse-10.1_x86_64/settings.default +++ b/lib/distro-info/suse-10.1_x86_64/settings.default @@ -4,6 +4,7 @@ bootstrap-packages = <<END 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 @@ -18,6 +19,7 @@ bootstrap-packages = <<END 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 @@ -53,13 +55,16 @@ bootstrap-packages = <<END 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> @@ -106,13 +111,18 @@ END name = SUSE Linux 10.1 updates file-for-speedtest = repodata/primary.xml.gz </repository> -<selection default> +<selection minimal> packages = <<END glibc-locale END </selection> +<selection kde> + base = minimal + packages = <<END + END +</selection> <selection gnome> - base = default + base = minimal packages = <<END 3ddiag 855resolution @@ -960,3 +970,6 @@ END zvbi END </selection> +<selection default> + 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 31e1ef17..2c360086 100644 --- a/lib/distro-info/suse-10.1_x86_64/settings.example +++ b/lib/distro-info/suse-10.1_x86_64/settings.example @@ -20,3 +20,4 @@ # packages = <<END # kinternet # END +#</selection> diff --git a/lib/distro-info/suse-10.2/prereqfiles/etc/hosts b/lib/distro-info/suse-10.2/prereqfiles/etc/hosts new file mode 100644 index 00000000..75721cd5 --- /dev/null +++ b/lib/distro-info/suse-10.2/prereqfiles/etc/hosts @@ -0,0 +1 @@ +127.0.0.1 localhost diff --git a/lib/distro-info/suse-10.2/settings.default b/lib/distro-info/suse-10.2/settings.default index 28692cba..682a98b9 100644 --- a/lib/distro-info/suse-10.2/settings.default +++ b/lib/distro-info/suse-10.2/settings.default @@ -4,6 +4,7 @@ bootstrap-packages = <<END 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 @@ -17,6 +18,7 @@ bootstrap-packages = <<END 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 @@ -53,12 +55,15 @@ bootstrap-packages = <<END 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 @@ -108,7 +113,13 @@ END name = openSUSE 10.2 updates file-for-speedtest = repodata/primary.xml.gz </repository> -<selection default> +<selection minimal> + packages = <<END + glibc-locale + END +</selection> +<selection textmode> + base = minimal packages = <<END acl acpid @@ -300,7 +311,7 @@ END END </selection> <selection kde> - base = default + base = textmode packages = <<END 3ddiag 915resolution @@ -458,7 +469,6 @@ END glib2 glibc glibc-i18ndata - glibc-locale glib-sharp2 glitz gmime @@ -1047,3 +1057,12 @@ END zvbi END </selection> +<selection gnome> + base = textmode + packages = <<END + END +</selection> +<selection default> + base = minimal +</selection> +
\ 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 72af6e4e..c32b0514 100644 --- a/lib/distro-info/suse-10.2/settings.example +++ b/lib/distro-info/suse-10.2/settings.example @@ -20,3 +20,4 @@ # packages = <<END # kinternet # END +#</selection> diff --git a/lib/distro-info/suse-10.2_x86_64/prereqfiles/etc/hosts b/lib/distro-info/suse-10.2_x86_64/prereqfiles/etc/hosts new file mode 100644 index 00000000..75721cd5 --- /dev/null +++ b/lib/distro-info/suse-10.2_x86_64/prereqfiles/etc/hosts @@ -0,0 +1 @@ +127.0.0.1 localhost diff --git a/lib/distro-info/suse-10.2_x86_64/settings.default b/lib/distro-info/suse-10.2_x86_64/settings.default index f2ac2457..c903ea1b 100644 --- a/lib/distro-info/suse-10.2_x86_64/settings.default +++ b/lib/distro-info/suse-10.2_x86_64/settings.default @@ -4,6 +4,7 @@ bootstrap-packages = <<END x86_64/audit-libs-1.2.6-20.x86_64.rpm x86_64/bash-3.1-55.x86_64.rpm x86_64/blocxx-1.0.0-36.x86_64.rpm + x86_64/bzip2-1.0.3-36.x86_64.rpm x86_64/coreutils-6.4-10.x86_64.rpm x86_64/cpio-2.6-40.x86_64.rpm x86_64/cracklib-2.8.9-20.x86_64.rpm @@ -17,6 +18,7 @@ bootstrap-packages = <<END x86_64/findutils-4.2.28-24.x86_64.rpm x86_64/gawk-3.1.5-41.x86_64.rpm x86_64/gdbm-1.8.3-261.x86_64.rpm + x86_64/glibc-2.5-25.x86_64.rpm x86_64/glibc-32bit-2.5-25.x86_64.rpm x86_64/gpg-1.4.5-24.x86_64.rpm x86_64/grep-2.5.1a-40.x86_64.rpm @@ -54,12 +56,15 @@ bootstrap-packages = <<END x86_64/perl-Bootloader-0.4.5-3.x86_64.rpm x86_64/perl-gettext-1.05-31.x86_64.rpm x86_64/permissions-2006.11.13-5.x86_64.rpm + x86_64/popt-1.7-304.x86_64.rpm x86_64/readline-5.1-55.x86_64.rpm x86_64/reiserfs-3.6.19-37.x86_64.rpm + x86_64/rpm-4.4.2-76.x86_64.rpm x86_64/sed-4.1.5-21.x86_64.rpm x86_64/sysvinit-2.86-47.x86_64.rpm x86_64/udev-103-12.x86_64.rpm x86_64/util-linux-2.12r-61.x86_64.rpm + x86_64/zlib-1.2.3-33.x86_64.rpm noarch/pciutils-ids-2006.11.18-2.noarch.rpm noarch/suse-build-key-1.0-707.noarch.rpm END @@ -109,7 +114,13 @@ END name = openSUSE 10.2 updates file-for-speedtest = repodata/primary.xml.gz </repository> -<selection default> +<selection minimal> + packages = <<END + glibc-locale + END +</selection> +<selection textmode> + base = minimal packages = <<END acl acpid @@ -300,3 +311,758 @@ END zsh END </selection> +<selection kde> + base = textmode + packages = <<END + 3ddiag + 915resolution + a2ps + aaa_base + aaa_skel + aalib + acl + acpid + AdobeICCProfiles + agfa-fonts + alsa + amarok + amarok-libvisual + amarok-xine + apparmor-docs + apparmor-parser + apparmor-profiles + apparmor-utils + arts + ash + aspell + aspell-de + aspell-en + at + atk + attr + audiofile + audit + audit-libs + autofs + autoyast2 + autoyast2-installation + bash + bc + bind-libs + bind-utils + binutils + blocxx + bluez-libs + bluez-utils + boost + bootsplash + bootsplash-theme-SuSE + bzip2 + cabextract + cairo + cdparanoia + cdrdao + CheckHardware + checkmedia + chromium + classpath + compat + compat-libstdc++ + compat-openssl097g + compiz + coreutils + cpio + cpp + cpp41 + cpufrequtils + cracklib + cron + Crystalcursors + cups + cups-client + cups-drivers + cups-libs + curl + cyrus-sasl + cyrus-sasl-crammd5 + cyrus-sasl-digestmd5 + cyrus-sasl-plain + cyrus-sasl-saslauthd + db + dbus-1 + dbus-1-glib + dbus-1-mono + dbus-1-qt3 + dbus-1-x11 + db-utils + dcraw + dejavu + deltarpm + desktop-data-SuSE + desktop-file-utils + desktop-translations + device-mapper + dhcdbd + dhcp + dhcpcd + dhcp-client + dialog + diffutils + digikam + digikamimageplugins + dirmngr + dmraid + dos2unix + dosbootdisk + dosfstools + dvd+rw-tools + e2fsprogs + ed + efont-unicode + eject + enscript + esound + ethtool + evms + evms-gui + exiftool + expat + fam + fbset + fftw3 + file + fileshareset + filesystem + fillup + findutils + flac + flash-player + fontconfig + fonts-config + foomatic-filters + freealut + freeciv + freeglut + freetype + freetype2 + fribidi + frozen-bubble + ft2demos + ftgl + fvwm2 + gail + gawk + gcc41-gij + gcc-gij + gconf2 + gdb + gdbm + gettext + ghostscript-fonts-other + ghostscript-fonts-std + ghostscript-library + ghostscript-x11 + giflib + gimp + gimp-help + gle + glib + glib2 + glibc + glibc-i18ndata + glib-sharp2 + glitz + gmime + gmp + gnokii + gnome-filesystem + gnome-icon-theme + gnome-keyring + gnome-mime-data + gnome-vfs2 + gnutls + gpart + gpg + gpg2 + gpgme + gpm + GraphicsMagick + grep + groff + grub + gsf-sharp + gstreamer010 + gstreamer010-plugins-base + gtk + gtk2 + gtk-sharp2 + gtksourceview + gutenprint + gwenview + gzip + hal + hal-resmgr + hdparm + hfsutils + hplip + hplip-hpijs + htdig + hwinfo + id3lib + ifnteuro + ifplugd + ImageMagick + ImageMagick-Magick++ + imlib + imlib2 + imlib2-loaders + info + info2html + initviocons + insserv + inst-source-utils + intlfnts + iproute2 + iptables + iputils + irqbalance + ispell + ispell-american + ispell-german + ispell-ngerman + jack + java-1_4_2-gcj-compat + java-1_5_0-sun + java-1_5_0-sun-plugin + jfsutils + joe + jpackage-utils + jpeg + k3b + kaffeine + kbd + kcm_gtk + kde3-i18n-de + kdeaddons3-kicker + kdeaddons3-konqueror + kdeartwork3-kscreensaver + kdeartwork3-xscreensaver + kdebase3 + kdebase3-kdm + kdebase3-ksysguardd + kdebase3-nsplugin + kdebase3-samba + kdebase3-session + kdebase3-SuSE + kdebluetooth + kdegames3 + kdegraphics3 + kdegraphics3-kamera + kdegraphics3-pdf + kdegraphics3-postscript + kdegraphics3-scan + kdelibs3 + kdelibs3-doc + kdemultimedia3 + kdemultimedia3-CD + kdemultimedia3-mixer + kdenetwork3 + kdenetwork3-InstantMessenger + kdenetwork3-news + kdenetwork3-vnc + kdepim3 + kdepim3-kpilot + kdepim3-networkstatus + kdepim3-notes + kdetv + kdeutils3 + kernel-default + kio_ipodslave + kio_iso + kio_slp + kipi-plugins + kitchensync + klogd + knights + koffice + koffice-i18n-de + koffice-i18n-de-doc + koffice-illustration + konversation + kpowersave + krb5 + krecord + ksh + ksudoku + ksymoops + ktorrent + kwin-decor-suse2 + lbreakout + ldapcpplib + less + libacl + libakode + libao + libapparmor + libart_lgpl + libattr + libbeagle + libbonobo + libbonoboui + libcap + libcom_err + libcroco + libdrm + libevent + libexif + libgcc41 + libgcj41 + libgcrypt + libgimpprint + libglade2 + libgnome + libgnomecanvas + libgnomecups + libgnomeprint + libgnomeprintui + libgnomesu + libgnomeui + libgpg-error + libgphoto2 + libgpod + libgsf + libgsf-gnome + libgssapi + libgtkhtml + libical + libicu + libidl + libidn + libieee1284 + libjasper + libjpeg + libkexif + libkipi + libksba + liblazy + liblcms + libltdl + libmal + libmikmod + libmng + libmpcdec + libmtp + libmusicbrainz + libnetpbm + libnjb + libnl + libnscd + libofa + libogg + liboil + libopencdk + libopensync + libopensync-plugin-file + libopensync-plugin-gnokii + libopensync-plugin-gpe + libopensync-plugin-irmc + libopensync-plugin-kdepim + libopensync-plugin-opie + libopensync-plugin-palm + libopensync-plugin-sunbird + libopensync-plugin-syncml + libopensync-tools + libpcap + libpng + libqt4 + libqt4-dbus-1 + libqt4-qt3support + libqt4-sql + libqt4-x11 + libqtpod + librpcsecgss + librsvg + libsamplerate + libsmbclient + libsndfile + libsoup + libstdc++41 + libstroke + libsyncml + libtheora + libtiff + libtunepimp + libusb + libvisual + libvolume_id + libvorbis + libwmf + libwnck + libxcrypt + libxml2 + libxslt + liby2util + libzio + libzypp + libzypp-zmd-backend + limal + limal-bootloader + limal-perl + logrotate + lsb + lsof + lua-libs + lukemftp + lvm2 + lzo + m4 + mailx + make + man + man-pages + manufacturer-PPDs + master-boot-code + mdadm + mDNSResponder-lib + Mesa + metacity + microcode_ctl + mingetty + mkinitrd + mkisofs + mktemp + module-init-tools + mono-core + mono-data + mono-data-sqlite + mono-web + MozillaFirefox + MozillaFirefox-translations + mozilla-nspr + mozilla-nss + mozilla-xulrunner181 + multipath-tools + myspell-american + myspell-german + ncurses + neon + netcat + netcfg + netpbm + net-snmp + net-tools + NetworkManager + NetworkManager-kde + nfsidmap + nfs-utils + nscd + ntfsprogs + numlockx + ocrad + openal + openct + OpenEXR + openldap2-client + openobex + OpenOffice_org + OpenOffice_org-de + OpenOffice_org-kde + OpenOffice_org-Quickstarter + opensc + openslp + openssh + openssh-askpass + openssl + opensuse-manual_de + opensuse-manual_en + openSUSE-release + orbit2 + pam + pam-config + pam-modules + pango + parted + patch + pax + pciutils + pciutils-ids + pcre + pcsc-lite + perl + perl-Bootloader + perl-Compress-Zlib + perl-Config-Crontab + perl-Crypt-SmbHash + perl-Crypt-SSLeay + perl-DBD-SQLite + perl-DBI + perl-Digest-HMAC + perl-Digest-MD4 + perl-Digest-SHA1 + perl-File-Tail + perl-gettext + perl-HTML-Parser + perl-HTML-Tagset + perl-IO-Zlib + perl-libwww-perl + perl-Net-Daemon + perl-Net-DNS + perl-Net-IP + perl-PlRPC + perl-spamassassin + perl-TermReadKey + perl-TimeDate + perl-URI + perl-XML-Parser + perl-XML-Writer + permissions + phalanx + pilot-link + pinentry + pinentry-qt + pkgconfig + pmtools + pm-utils + PolicyKit + poppler + poppler-qt + popt + portmap + postfix + powersave + powersave-libs + ppp + pptp + preload + procinfo + procmail + procps + providers + psmisc + pwdutils + python + python-qt + python-xml + qca + qlogic-firmware + qscintilla + qt3 + qtcurve-gtk2 + rdesktop + readline + RealPlayer + recode + reiserfs + release-notes + resmgr + rpm + rrdtool + rsync + ruby + sane + sane-frontends + sash + sax2 + sax2-gui + sax2-ident + sax2-libsax + sax2-libsax-perl + sax2-tools + scpm + screen + scsi + SDL + SDL_image + SDL_mixer + SDL_net + SDL_Pango + SDL_perl + SDL_ttf + sed + sensors + sgml-skel + shared-mime-info + sharutils + siga + smartmontools + smpppd + spamassassin + speex + sqlite + sqlite2 + sqlite-zmd + startup-notification + strace + sudo + supertux + suse-build-key + SuSEfirewall2 + susehelp + susehelp_de + suseRegister + suspend + sysconfig + sysfsutils + syslog-ng + sysvinit + taglib + tar + tcl + tcpd + tcpdump + tcsh + telnet + terminfo + tightvnc + timezone + tk + udev + ufraw + ufraw-gimp + ulimit + unclutter + unzip + update-alternatives + usbutils + utempter + util-linux + v4l-conf + vim + w3m + wbxml2 + wdiff + wget + wireless-tools + wodim + words + wpa_supplicant + wv + wvdial + wvstreams + x11-input-synaptics + x11-input-wacom + x11-tools + xaw3d + xdg-menu + xdg-utils + xdmbgrd + xfsprogs + xgl + xgl-hardware-list + xine-lib + xinetd + xkeyboard-config + xli + xlockmore + xmoto + xntp + xorg-x11 + xorg-x11-driver-input + xorg-x11-driver-video + xorg-x11-fonts + xorg-x11-fonts-core + xorg-x11-libfontenc + xorg-x11-libICE + xorg-x11-libs + xorg-x11-libSM + xorg-x11-libX11 + xorg-x11-libX11-ccache + xorg-x11-libXau + xorg-x11-libXdmcp + xorg-x11-libXext + xorg-x11-libXfixes + xorg-x11-libxkbfile + xorg-x11-libXmu + xorg-x11-libXp + xorg-x11-libXpm + xorg-x11-libXprintUtil + xorg-x11-libXrender + xorg-x11-libXt + xorg-x11-libXv + xorg-x11-server + xorg-x11-Xvnc + xpdf-tools + xscreensaver + xterm + xtermset + yast2 + yast2-apparmor + yast2-backup + yast2-bluetooth + yast2-bootfloppy + yast2-bootloader + yast2-control-center + yast2-core + yast2-country + yast2-firewall + yast2-hardware-detection + yast2-inetd + yast2-installation + yast2-irda + yast2-iscsi-client + yast2-kerberos-client + yast2-ldap + yast2-ldap-client + yast2-mail + yast2-mail-aliases + yast2-mouse + yast2-ncurses + yast2-network + yast2-nfs-client + yast2-nis-client + yast2-ntp-client + yast2-online-update + yast2-online-update-frontend + yast2-packager + yast2-pam + yast2-perl-bindings + yast2-pkg-bindings + yast2-power-management + yast2-powertweak + yast2-printer + yast2-profile-manager + yast2-qt + yast2-registration + yast2-repair + yast2-restore + yast2-runlevel + yast2-samba-client + yast2-samba-server + yast2-scanner + yast2-schema + yast2-security + yast2-slp + yast2-sound + yast2-storage + yast2-storage-evms + yast2-storage-lib + yast2-sudo + yast2-support + yast2-sysconfig + yast2-theme-openSUSE + yast2-trans-de + yast2-transfer + yast2-trans-stats + yast2-tune + yast2-tv + yast2-update + yast2-users + yast2-x11 + yast2-xml + ypbind + yp-tools + zip + zisofs-tools + zlib + zsh + zvbi + END +</selection> +<selection gnome> + base = textmode + packages = <<END + END +</selection> +<selection default> + base = minimal +</selection> diff --git a/lib/distro-info/suse-10.2_x86_64/settings.example b/lib/distro-info/suse-10.2_x86_64/settings.example index 72af6e4e..c32b0514 100644 --- a/lib/distro-info/suse-10.2_x86_64/settings.example +++ b/lib/distro-info/suse-10.2_x86_64/settings.example @@ -20,3 +20,4 @@ # packages = <<END # kinternet # END +#</selection> diff --git a/lib/distro-info/ubuntu-6.10/settings.default b/lib/distro-info/ubuntu-6.10/settings.default index 64975f8f..0b183976 100644 --- a/lib/distro-info/ubuntu-6.10/settings.default +++ b/lib/distro-info/ubuntu-6.10/settings.default @@ -1,6 +1,7 @@ arch = i386 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 @@ -22,28 +23,30 @@ prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb repo-subdir = dists file-for-speedtest = dists/edgy-updates/main/binary-i386/Packages.bz2 </repository> -<selection default> +<selection minimal> packages = <<END language-pack-de linux-image-generic END </selection> <selection gnome> - base = default + base = minimal packages = <<END ubuntu-desktop END </selection> <selection kde> - base = default + base = minimal packages = <<END kubuntu-desktop END </selection> <selection xfce> - base = default + base = minimal packages = <<END xubuntu-desktop END </selection> -release-name = edgy +<selection default> + base = minimal +</selection> diff --git a/lib/distro-info/ubuntu-6.10/settings.example b/lib/distro-info/ubuntu-6.10/settings.example index 7afffd10..ac02e5b4 100644 --- a/lib/distro-info/ubuntu-6.10/settings.example +++ b/lib/distro-info/ubuntu-6.10/settings.example @@ -20,3 +20,4 @@ # 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 372e598f..9b91cf56 100644 --- a/lib/distro-info/ubuntu-6.10_amd64/settings.default +++ b/lib/distro-info/ubuntu-6.10_amd64/settings.default @@ -1,6 +1,7 @@ arch = amd64 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 @@ -22,28 +23,30 @@ prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb repo-subdir = dists file-for-speedtest = dists/edgy-updates/main/binary-amd64/Packages.bz2 </repository> -<selection default> +<selection minimal> packages = <<END language-pack-de linux-image-generic END </selection> <selection gnome> - base = default + base = minimal packages = <<END ubuntu-desktop END </selection> <selection kde> - base = default + base = minimal packages = <<END kubuntu-desktop END </selection> <selection xfce> - base = default + base = minimal packages = <<END xubuntu-desktop END </selection> -release-name = edgy +<selection default> + 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 7afffd10..ac02e5b4 100644 --- a/lib/distro-info/ubuntu-6.10_amd64/settings.example +++ b/lib/distro-info/ubuntu-6.10_amd64/settings.example @@ -20,3 +20,4 @@ # 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 a6482070..4e83d0da 100644 --- a/lib/distro-info/ubuntu-7.04/settings.default +++ b/lib/distro-info/ubuntu-7.04/settings.default @@ -1,6 +1,7 @@ arch = i386 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 @@ -22,28 +23,30 @@ prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb repo-subdir = dists file-for-speedtest = dists/feisty-updates/main/binary-i386/Packages.bz2 </repository> -<selection default> +<selection minimal> packages = <<END language-pack-de linux-image-generic END </selection> <selection gnome> - base = default + base = minimal packages = <<END ubuntu-desktop END </selection> <selection kde> - base = default + base = minimal packages = <<END kubuntu-desktop END </selection> <selection xfce> - base = default + base = minimal packages = <<END xubuntu-desktop END </selection> -release-name = feisty +<selection default> + base = minimal +</selection> diff --git a/lib/distro-info/ubuntu-7.04/settings.example b/lib/distro-info/ubuntu-7.04/settings.example index 7afffd10..ac02e5b4 100644 --- a/lib/distro-info/ubuntu-7.04/settings.example +++ b/lib/distro-info/ubuntu-7.04/settings.example @@ -20,3 +20,4 @@ # 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 d753e374..461c8e3d 100644 --- a/lib/distro-info/ubuntu-7.04_amd64/settings.default +++ b/lib/distro-info/ubuntu-7.04_amd64/settings.default @@ -1,6 +1,7 @@ arch = amd64 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 @@ -22,28 +23,30 @@ prereq-packages = main/d/debootstrap/debootstrap_0.3.3.2ubuntu3_all.deb repo-subdir = dists file-for-speedtest = dists/feisty-updates/main/binary-amd64/Packages.bz2 </repository> -<selection default> +<selection minimal> packages = <<END language-pack-de linux-image-generic END </selection> <selection gnome> - base = default + base = minimal packages = <<END ubuntu-desktop END </selection> <selection kde> - base = default + base = minimal packages = <<END kubuntu-desktop END </selection> <selection xfce> - base = default + base = minimal packages = <<END xubuntu-desktop END </selection> -release-name = feisty +<selection default> + 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 7afffd10..ac02e5b4 100644 --- a/lib/distro-info/ubuntu-7.04_amd64/settings.example +++ b/lib/distro-info/ubuntu-7.04_amd64/settings.example @@ -20,3 +20,4 @@ # packages = <<END # kinternet # END +#</selection> |