From 803f61ccd2fce4b16f0dd8fb8394883fa58dfcdc Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 29 Jul 2007 22:23:55 +0000 Subject: * more work towards Debian & Ubuntu support, Debian-4.0, Ubuntu-6.10 & Ubuntu-7.04 seem to be working ok, now. Only Debian-3.1 refuses to install any kernel, tsk! git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1283 95ad53e4-c205-0410-b2fa-d234c58c8868 --- installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm | 4 +- installer/OpenSLX/OSSetup/Distro/Debian_4_0.pm | 6 +- installer/OpenSLX/OSSetup/Distro/Ubuntu_6_10.pm | 6 +- installer/OpenSLX/OSSetup/Distro/Ubuntu_7_04.pm | 103 ++++++++++++++++++++++++ installer/OpenSLX/OSSetup/Engine.pm | 8 +- installer/OpenSLX/OSSetup/Packager/dpkg.pm | 2 +- 6 files changed, 116 insertions(+), 13 deletions(-) create mode 100644 installer/OpenSLX/OSSetup/Distro/Ubuntu_7_04.pm (limited to 'installer') diff --git a/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm b/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm index 22c35917..6fd4c74e 100644 --- a/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm +++ b/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm @@ -53,7 +53,7 @@ sub initDistroInfo $self->{config}->{'package-subdir'} = 'pool'; $self->{config}->{'prereq-packages'} = " - main/d/debootstrap/debootstrap_1.0.0_all.deb + main/d/debootstrap/debootstrap_0.3.3.2_all.deb "; $self->{config}->{'bootstrap-packages'} = " @@ -62,7 +62,7 @@ sub initDistroInfo $self->{config}->{'selection'} = { 'default' => " kernel-image-2.6-386 - kmail + locales ", }; diff --git a/installer/OpenSLX/OSSetup/Distro/Debian_4_0.pm b/installer/OpenSLX/OSSetup/Distro/Debian_4_0.pm index df0d81e0..766235bb 100644 --- a/installer/OpenSLX/OSSetup/Distro/Debian_4_0.pm +++ b/installer/OpenSLX/OSSetup/Distro/Debian_4_0.pm @@ -53,7 +53,7 @@ sub initDistroInfo $self->{config}->{'package-subdir'} = 'pool'; $self->{config}->{'prereq-packages'} = " - main/d/debootstrap/debootstrap_1.0.0_all.deb + main/d/debootstrap/debootstrap_0.3.3.2etch1_all.deb "; $self->{config}->{'bootstrap-packages'} = " @@ -61,8 +61,8 @@ sub initDistroInfo $self->{config}->{'selection'} = { 'default' => " - kernel-image-2.6-386 - kmail + linux-image-486 + locales-all ", }; diff --git a/installer/OpenSLX/OSSetup/Distro/Ubuntu_6_10.pm b/installer/OpenSLX/OSSetup/Distro/Ubuntu_6_10.pm index d2ce3bd6..636d5bfa 100644 --- a/installer/OpenSLX/OSSetup/Distro/Ubuntu_6_10.pm +++ b/installer/OpenSLX/OSSetup/Distro/Ubuntu_6_10.pm @@ -70,7 +70,7 @@ sub initDistroInfo $self->{config}->{'package-subdir'} = 'pool'; $self->{config}->{'prereq-packages'} = " - main/d/debootstrap/debootstrap_1.0.0_all.deb + main/d/debootstrap/debootstrap_0.3.3.3ubuntu3~edgy1_all.deb "; $self->{config}->{'bootstrap-packages'} = " @@ -78,8 +78,8 @@ sub initDistroInfo $self->{config}->{'selection'} = { 'default' => " - kernel-image-2.6-386 - kmail + language-pack-de + linux-image-generic ", }; return; diff --git a/installer/OpenSLX/OSSetup/Distro/Ubuntu_7_04.pm b/installer/OpenSLX/OSSetup/Distro/Ubuntu_7_04.pm new file mode 100644 index 00000000..306481f2 --- /dev/null +++ b/installer/OpenSLX/OSSetup/Distro/Ubuntu_7_04.pm @@ -0,0 +1,103 @@ +# Copyright (c) 2006, 2007 - OpenSLX GmbH +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# Ubuntu_7_04.pm +# - provides Ubuntu-7.04-specific overrides of the OpenSLX OSSetup API. +# ----------------------------------------------------------------------------- +package OpenSLX::OSSetup::Distro::Ubuntu_7_04; + +use strict; +use warnings; + +use base qw(OpenSLX::OSSetup::Distro::Ubuntu); + +use OpenSLX::Basics; + +################################################################################ +### implementation +################################################################################ +sub new +{ + my $class = shift; + my $self = { + 'base-name' => 'ubuntu-7.04', + 'arch' => 'i386', + 'release-name' => 'feisty', + }; + return bless $self, $class; +} + +sub initDistroInfo +{ + my $self = shift; + $self->{config}->{'repository'} = { + 'base' => { + 'urls' => " + http://ubuntu.intergenia.de/ubuntu + ", + 'name' => 'Ubuntu 7.04', + 'repo-subdir' => 'dists', + 'distribution' => 'feisty', + 'components' => 'main restricted', + }, + 'base_updates' => { + 'urls' => " + ftp://localhost/pub/ubuntu + ", + 'name' => 'Ubuntu 7.04 Updates', + 'repo-subdir' => 'dists', + 'distribution' => 'feisty-updates', + 'components' => 'main restricted', + }, + 'base_security' => { + 'urls' => " + ftp://localhost/pub/ubuntu + ", + 'name' => 'Ubuntu 7.04 Security', + 'repo-subdir' => 'dists', + 'distribution' => 'feisty-security', + 'components' => 'main restricted', + }, + }; + + $self->{config}->{'package-subdir'} = 'pool'; + + $self->{config}->{'prereq-packages'} = " + main/d/debootstrap/debootstrap_0.3.3.3ubuntu3~feisty1_all.deb + "; + + $self->{config}->{'bootstrap-packages'} = " + "; + + $self->{config}->{'selection'} = { + 'default' => " + language-pack-de + linux-image-generic + ", + + 'gnome' => " + <<>> + ubuntu-desktop + ", + + 'kde' => " + <<>> + kubuntu-desktop + ", + + 'xfce' => " + <<>> + xubuntu-desktop + ", + }; + return; +} + +1; \ No newline at end of file diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index 3876b672..0e43443c 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -34,7 +34,7 @@ use vars qw(%supportedDistros); %supportedDistros = ( 'debian-3.1' => { - module => 'Debian_3_1', support => 'clone,install' + module => 'Debian_3_1', support => 'clone' }, 'debian-4.0' => { module => 'Debian_4_0', support => 'clone,install' @@ -79,10 +79,10 @@ use vars qw(%supportedDistros); module => 'Ubuntu_6_06', support => 'clone' }, 'ubuntu-6.10' => { - module => 'Ubuntu_6_10', support => 'clone' + module => 'Ubuntu_6_10', support => 'clone,install' }, 'ubuntu-7.04' => { - module => 'Ubuntu_7_04', support => 'clone' + module => 'Ubuntu_7_04', support => 'clone,install' }, ); @@ -1189,7 +1189,7 @@ sub _startChrootedShellInStage1D chrootDir => $self->{'vendor-os-path'}, function => sub { # will hang until user exits manually: - slxsystem('sh'); + slxsystem($openslxConfig{'default-shell'}); }, updateConfig => 1, }); diff --git a/installer/OpenSLX/OSSetup/Packager/dpkg.pm b/installer/OpenSLX/OSSetup/Packager/dpkg.pm index 887a26d6..f1591a6c 100644 --- a/installer/OpenSLX/OSSetup/Packager/dpkg.pm +++ b/installer/OpenSLX/OSSetup/Packager/dpkg.pm @@ -94,7 +94,7 @@ sub getInstalledPackages { my $self = shift; - my $rpmCmd = 'dpkg-query -f "\${package}\n" --show'; + my $rpmCmd = 'dpkg-query --showformat "\${package}\n" --show'; my $pkgList = qx{$rpmCmd}; return split "\n", $pkgList; } -- cgit v1.2.3-55-g7522