From ba595445ed4eee7a23374140b9fbb5d907fef381 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 20 May 2005 05:40:00 +0000
Subject: keep binaries in their "standard" binary dir instead of moving
 everything to /usr/bin (it used to be in /usr/bin when the stage1 was not
 exited)

---
 perl-install/share/aliases  | 16 ++++++++--------
 perl-install/share/list.xml |  2 +-
 perl-install/share/symlinks |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'perl-install/share')

diff --git a/perl-install/share/aliases b/perl-install/share/aliases
index 7c2947345..a5ed9f2f2 100644
--- a/perl-install/share/aliases
+++ b/perl-install/share/aliases
@@ -1,8 +1,8 @@
-gunzip gzip
-install2 perl-install/install2
-commands perl-install/commands
-runinstall2 install2
-fsck.ext2 e2fsck
-lsmod lsmod-25
-rmmod rmmod-25
-insmod_ insmod-25
+/bin/gunzip gzip
+/usr/bin/install2 perl-install/install2
+/usr/bin/commands perl-install/commands
+/usr/bin/runinstall2 install2
+/sbin/fsck.ext2 e2fsck
+/sbin/lsmod lsmod-25
+/sbin/rmmod rmmod-25
+/sbin/insmod_ insmod-25
diff --git a/perl-install/share/list.xml b/perl-install/share/list.xml
index 8d725f477..a0baaa890 100644
--- a/perl-install/share/list.xml
+++ b/perl-install/share/list.xml
@@ -37,7 +37,7 @@
   perl
   monitor-edid monitor-parse-edid monitor-get-edid
 
-  <filter subst="s!^echo!/usr/bin/echo!">
+  <filter subst="s!^echo!/bin/echo!">
     unicode_start
   </filter>
 
diff --git a/perl-install/share/symlinks b/perl-install/share/symlinks
index d2db5f4b7..3700a3c57 100644
--- a/perl-install/share/symlinks
+++ b/perl-install/share/symlinks
@@ -1,5 +1,5 @@
-/usr/bin /sbin
-/sbin /bin
+/sbin
+/bin
 /proc/mounts /etc/mtab
 /etc/protocols
 /etc/services
-- 
cgit v1.2.1