From 12e230568169165d4eceb74b9a1969c9a31113f4 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Sun, 6 Apr 2008 17:57:24 +0000
Subject: * make use of loadDistroModule(), now that we have it

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1724 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/OpenSLX/MakeInitRamFS/Engine.pm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'initramfs/OpenSLX/MakeInitRamFS/Engine.pm')

diff --git a/initramfs/OpenSLX/MakeInitRamFS/Engine.pm b/initramfs/OpenSLX/MakeInitRamFS/Engine.pm
index efa8d1de..996d5f93 100644
--- a/initramfs/OpenSLX/MakeInitRamFS/Engine.pm
+++ b/initramfs/OpenSLX/MakeInitRamFS/Engine.pm
@@ -60,12 +60,18 @@ sub new
 
     $self->{'distro-name'} = lc($1);
     $self->{'distro-ver'} = $2;
+    
+    my $fullDistroName = lc($1) . '-' . $2;
 
-    my $distroModule 
-        = 'OpenSLX::MakeInitRamFS::Distro::' . ucfirst($self->{'distro-name'});
-    if (!eval { $self->{distro} = instantiateClass($distroModule); }) {
-        $self->{distro} 
-            = instantiateClass('OpenSLX::MakeInitRamFS::Distro::Base');
+    $self->{distro} = loadDistroModule({
+        distroName  => $fullDistroName,
+        distroScope => 'OpenSLX::MakeInitRamFS::Distro',
+    });
+    if (!$self->{distro}) {
+        die _tr(
+            'unable to load any MakeInitRamFS::Distro module for system %s!',
+            $self->{'system-name'}
+        );
     }
     
     $self->{'lib-scanner'} 
-- 
cgit v1.2.3-55-g7522