Remove unneeded library ld stuff of deprecated uclibc.

3 files changed, 24 insertions, 25 deletions

diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm
index c5d23a49..524aa398 100644
--- a/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2006..2009 - OpenSLX GmbH
+# Copyright (c) 2006..2010 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -230,17 +230,17 @@ sub getDefaultPathList
     ) ];
 }
 
-sub addUclibLdconfig
-{
-    my $self       = shift;
-    #my $ldpath     = shift;
-
-    open(OUTFILE, ">", "/etc/ld.so.conf.d/uclib.conf") 
-      or die ("unable to create the uclib.conf within ld.so.conf.d");
-    print OUTFILE "/opt/openslx/uclib-rootfs/lib\n";
-    print OUTFILE "/opt/openslx/uclib-rootfs/usr/lib\n";
-    close(OUTFILE);
-}
+#sub addUclibLdconfig
+#{
+#    my $self       = shift;
+#    #my $ldpath     = shift;
+#
+#    open(OUTFILE, ">", "/etc/ld.so.conf.d/uclib.conf") 
+#      or die ("unable to create the uclib.conf within ld.so.conf.d");
+#    print OUTFILE "/opt/openslx/uclib-rootfs/lib\n";
+#    print OUTFILE "/opt/openslx/uclib-rootfs/usr/lib\n";
+#    close(OUTFILE);
+#}
 
 sub updateDistroConfig
 {
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 3531e92d..65a68bd4 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -282,19 +282,18 @@ sub installVendorOS
     # generate default openslx directories for the client
     $self->_generateDefaultDirs();
 
-    # add the uclibs and tools to the stage1 and add them to library search
-    # path
+    # add the uclibs and tools to the stage1
     $self->_copyUclibcRootfs();
-    callInSubprocess(
-        sub {
-            $self->_callChrootedFunction({
-            chrootDir    => $self->{'vendor-os-path'},
-            function     => sub {
-                $self->{'distro'}->addUclibLdconfig();
-        },
-        updateConfig => 1,
-        });
-    });
+    #callInSubprocess(
+    #    sub {
+    #        $self->_callChrootedFunction({
+    #        chrootDir    => $self->{'vendor-os-path'},
+    #        function     => sub {
+    #            $self->{'distro'}->addUclibLdconfig();
+    #    },
+    #    updateConfig => 1,
+    #    });
+    #});
     $self->_touchVendorOS();
     $self->addInstalledVendorOSToConfigDB();
     return;
diff --git a/os-plugins/plugins/syslog/OpenSLX/Distro/Base.pm b/os-plugins/plugins/syslog/OpenSLX/Distro/Base.pm
index 654d755e..ed08c5f3 100644
--- a/os-plugins/plugins/syslog/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/syslog/OpenSLX/Distro/Base.pm
@@ -49,7 +49,7 @@ sub runlevelInfo
     my $kind = shift;
     
     # most distros (well: Debian & Ubuntu) use a different initscript depending
-    # on which version of syslog is installed ('syslogd' or 'syslog-ng')
+    # on which version of syslog is installed ('syslogd', 'syslog-ng' or 'rsyslog')
     my %nameMap = (
         'syslogd'   => 'sysklogd',
         'syslog-ng' => 'syslog-ng',