diff options
author | Oliver Tappe | 2007-08-23 22:00:47 +0200 |
---|---|---|
committer | Oliver Tappe | 2007-08-23 22:00:47 +0200 |
commit | f4889336897bdb9febca46fbf5e326d824181ed5 (patch) | |
tree | f5cd95c755c268858613e6cf89f73b5dba6ba11b /installer | |
parent | * fixed problem reported by Dirk that caused debian-3.1 (diff) | |
download | core-f4889336897bdb9febca46fbf5e326d824181ed5.tar.gz core-f4889336897bdb9febca46fbf5e326d824181ed5.tar.xz core-f4889336897bdb9febca46fbf5e326d824181ed5.zip |
* fixed small bug that introduced an unnecessary prompt during installation
of Debian-3.1 and made use of the meta-packager when installing the
initrd-tools (as it's cleaner that way).
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1325 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rw-r--r-- | installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm | 2 | ||||
-rw-r--r-- | installer/OpenSLX/OSSetup/MetaPackager/apt.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm b/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm index 438ffd6b..6dd99e06 100644 --- a/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm +++ b/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm @@ -35,7 +35,7 @@ sub preSystemInstallationHook # # in order to circumvent this problem, we manually install initrd-tools # (which contains mkinitrd) ... - slxsystem("apt-get install initrd-tools"); + $self->{engine}->{'meta-packager'}->installSelection('initrd-tools'); # ... and replace /usr/sbin/mkinitrd with a dummy, in order to skip the # initrd-creation. rename('/usr/sbin/mkinitrd', '/usr/sbin/_mkinitrd'); diff --git a/installer/OpenSLX/OSSetup/MetaPackager/apt.pm b/installer/OpenSLX/OSSetup/MetaPackager/apt.pm index 2fee5f7e..ba9c6722 100644 --- a/installer/OpenSLX/OSSetup/MetaPackager/apt.pm +++ b/installer/OpenSLX/OSSetup/MetaPackager/apt.pm @@ -92,7 +92,7 @@ sub installSelection my $self = shift; my $pkgSelection = shift; - if (slxsystem("apt-get update")) { + if (slxsystem("apt-get -y update")) { die _tr("unable to update repository info (%s)\n", $!); } if (slxsystem("apt-get -y install $pkgSelection")) { |