From 6ad6d7707e893016e82eeb75f4f08131d12700e7 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Mon, 4 Oct 2010 17:42:02 +0200
Subject: remove uClibc stuff - part I

---
 src/installer/OpenSLX/OSSetup/Engine.pm | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/installer/OpenSLX')

diff --git a/src/installer/OpenSLX/OSSetup/Engine.pm b/src/installer/OpenSLX/OSSetup/Engine.pm
index 642a058b..4de9ce41 100644
--- a/src/installer/OpenSLX/OSSetup/Engine.pm
+++ b/src/installer/OpenSLX/OSSetup/Engine.pm
@@ -282,8 +282,8 @@ sub installVendorOS
     # generate default openslx directories for the client
     $self->_generateDefaultDirs();
 
-    # add the uclibs and tools to the stage1
-    $self->_copyUclibcRootfs();
+    # add the initramfs rootfs and tools to the stage1
+    $self->_copyRootfs();
     #callInSubprocess(
     #    sub {
     #        $self->_callChrootedFunction({
@@ -384,8 +384,8 @@ sub cloneVendorOS
     # generate default openslx directories for the client
     $self->_generateDefaultDirs();
     
-    # add the uclibs and tools to the stage1
-    $self->_copyUclibcRootfs();
+    # add the initramfs rootfs and tools to the stage1
+    $self->_copyRootfs();
     $self->_touchVendorOS();
     $self->addInstalledVendorOSToConfigDB();
     return;
@@ -414,7 +414,7 @@ sub updateVendorOS
     );
 
     $self->_generateDefaultDirs();
-    $self->_copyUclibcRootfs();
+    $self->_copyRootfs();
     $self->_touchVendorOS();
     vlog(
         0,
@@ -710,12 +710,12 @@ sub busyboxBinary
 {
     my $self = shift;
     
-    my $uclibdir = "$openslxConfig{'base-path'}/share/uclib-rootfs";
+    my $rootfsDir = "$openslxConfig{'base-path'}/share/rootfs";
 
     return sprintf(
         "LD_LIBRARY_PATH=%s/lib %s/bin/busybox",
-        $uclibdir,
-        $uclibdir
+        $rootfsDir,
+        $rootfsDir
     );
 }
 
@@ -1130,22 +1130,22 @@ sub _generateDefaultDirs
         "$openslxDefaultPath");
 }
 
-sub _copyUclibcRootfs
+sub _copyRootfs
 {
     my $self = shift;
     my $targetRoot = shift || $self->{'vendor-os-path'};
     my $distro = $self->{distro};
 
-    vlog(0, _tr("copying uclibc-rootfs into vendor-OS ...\n"));
+    vlog(0, _tr("copying rootfs into vendor-OS ...\n"));
 
-    my $target     = "$targetRoot/opt/openslx/uclib-rootfs";
+    my $target     = "$targetRoot/opt/openslx/rootfs";
 
     if (system("mkdir -p $target")) {
         die _tr("unable to create directory '%s', giving up! (%s)\n",
                 $target, $!);
     }
 
-    my $uclibcRootfs = "$openslxConfig{'base-path'}/share/uclib-rootfs";
+    my $rootfs = "$openslxConfig{'base-path'}/share/rootfs";
     my @excludes = qw(
         dialog
         kexec
@@ -1156,7 +1156,7 @@ sub _copyUclibcRootfs
     vlog(3, _tr("using exclude-filter:\n%s\n", $exclOpts));
     my $rsyncFH;
     my $rsyncCmd
-        = "rsync -aq --delete-excluded --exclude-from=- $uclibcRootfs/ $target";
+        = "rsync -aq --delete-excluded --exclude-from=- $rootfs/ $target";
     vlog(2, "executing: $rsyncCmd\n");
     # if we're doing a fresh install we need to create /lib, /bin first
     mkdir "$targetRoot/lib";
@@ -1164,13 +1164,13 @@ sub _copyUclibcRootfs
 
     open($rsyncFH, '|-', $rsyncCmd)
         or die _tr("unable to start rsync for source '%s', giving up! (%s)",
-                   $uclibcRootfs, $!);
+                   $rootfs, $!);
     print $rsyncFH $exclOpts;
     close($rsyncFH)
         or die _tr("unable to copy to target '%s', giving up! (%s)",
                    $target, $!);
 
-    # write version of uclibc-rootfs original into a file in order to be
+    # write version of initramfs-rootfs original into a file in order to be
     # able to check the up-to-date state later (in the config-demuxer)
     slxsystem("slxversion >${target}.version");
 
@@ -1364,18 +1364,18 @@ sub _setupStage1A
             $stage1cDir, $!);
     }
 
-    $self->_stage1A_setupUclibcEnvironment();
+    $self->_stage1A_setupRootfsEnvironment();
     $self->_stage1A_copyPrerequiredFiles();
     $self->_stage1A_copyTrustedPackageKeys();
     $self->_stage1A_createRequiredFiles();
     return;
 }
 
-sub _stage1A_setupUclibcEnvironment
+sub _stage1A_setupRootfsEnvironment
 {
     my $self = shift;
-    $self->_copyUclibcRootfs("$self->{stage1aDir}/$self->{stage1bSubdir}");
-    my $source = "$self->{stage1bSubdir}/opt/openslx/uclib-rootfs";
+    $self->_copyRootfs("$self->{stage1aDir}/$self->{stage1bSubdir}");
+    my $source = "$self->{stage1bSubdir}/opt/openslx/rootfs";
     my $target = "$self->{stage1aDir}";
     slxsystem("ln -sf $source/bin $target/bin");
     slxsystem("ln -sf $source/lib $target/lib");
-- 
cgit v1.2.3-55-g7522