Merge branch 'master' of openslx.org:openslx/core

3 files changed, 13 insertions, 13 deletions

diff --git a/initramfs/stage3-stuff/etc/messages b/initramfs/stage3-stuff/etc/messages
index 81748642..ca66245d 100644
--- a/initramfs/stage3-stuff/etc/messages
+++ b/initramfs/stage3-stuff/etc/messages
@@ -153,14 +153,14 @@ is needed\n  for the bootup procedure to follow. If upstart is used instead no \
 inittab\n  is needed any more, but a proper configured events.d."
 df_errumod="    Failed to load the \"unix\" module. Problems with Hardware \
 detection\nwill probably arise."
-df_errserv=" seems not to be installed or start script is\n  not available\
+df_errserv="seems not to be installed or start script is\n  not available\
 so requesting the start of service make no sense. Please\n  disable service\
 or install the files/packages needed."
 df_errcron="  The cron start script $df_errserv" 
 df_errsysl="  The syslog start script $df_errserv"
 df_errsshd="  The sshd start script $df_errserv"
 df_erryp="  The NIS client $df_errserv"
-df_errpmap="   The portmapper $df_errserv"
+df_errpmap="  The portmapper $df_errserv"
 df_erramnt="  Automounter $df_errserv"
 df_errnsc="  Name Service caching deamon $df_errserv\n This service might \
 be useful to take load from a ldap user directory."
diff --git a/initramfs/stage3-stuff/etc/messages.de b/initramfs/stage3-stuff/etc/messages.de
index a1ff5149..487332d7 100644
--- a/initramfs/stage3-stuff/etc/messages.de
+++ b/initramfs/stage3-stuff/etc/messages.de
@@ -169,7 +169,7 @@ df_errcron="  Das cron Start-Skript $df_errserv"
 df_errsysl="  Das syslog Start-Skript $df_errserv"
 df_errsshd="  Das sshd Start-Skript $df_errserv"
 df_erryp="  Der NIS-Klient $df_errserv"
-df_errpmap="   Der Portmapper $df_errserv"
+df_errpmap="  Der Portmapper $df_errserv"
 df_erramnt="  Der Automounter $df_errserv"
 df_errnsc="  Der Name Service Zwischenspeicherungs Daemon $df_errserv\n  \
 Dieser Dienst koennte nuetzlich sein, um Daten von einem ldap Benutzer-\
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 6faf12c7..fad2ad98 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -387,16 +387,16 @@ sub cloneVendorOS
     # add the uclibs and tools to the stage1 and add them to library search
     # path
     $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;