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)

6 files changed, 17 insertions, 19 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index 0834fc250..e4c7b87d3 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -100,9 +100,7 @@ mo_files : $(MOFILES)
 get_needed_files: $(DIRS) mo_files
 	REP4PMS=$(REP4PMS) ../tools/install-xml-file-list share/list.xml $(DEST)
 
-	mv -f $(DEST)/{bin,sbin}/* $(DEST)/usr/bin
 	mv -f $(DEST)/usr/{lib,X11R6/lib}/*.so* $(DEST)/lib
-	rmdir $(DEST)/{bin,sbin}
 	../tools/simplify-drakx-modules $(DEST)/usr/*/*/*/utf8_heavy.pl
 
 	cp -f $(STAGE1)/init-stage2 $(DEST)/etc/init
@@ -111,11 +109,11 @@ get_needed_files: $(DIRS) mo_files
 
 	perl -I. -Mlang -e 'symlink "UTF-8", "$(DEST)/usr/share/locale/$$_" foreach lang::list_langs()'
 
-	perl -ane 'symlink "$$F[1]", "$(DEST)/usr/bin/$$F[0]"' share/aliases
+	perl -ane 'symlink "$$F[1]", "$(DEST)$$F[0]"' share/aliases
 ifeq (ia64,$(ARCH))
-	ln -sf bash $(DEST)/usr/bin/sh
+	ln -sf bash $(DEST)/bin/sh
 else
-	ln -sf ash $(DEST)/usr/bin/sh
+	ln -sf ash $(DEST)/bin/sh
 endif
 
 	mkfontdir $(DEST)/usr/X11R6/lib/X11/fonts
@@ -131,7 +129,7 @@ endif
 	rm -rf $(DEST)/usr/share/locale_special/{be,fur,ta}
 
 ifeq (y,$(USE_PCMCIA))
-	install -s /sbin/cardmgr $(DEST)/usr/bin
+	install -s /sbin/cardmgr $(DEST)/sbin
 	cp -a /etc/pcmcia $(DEST)/etc
 	../tools/patch_pcmcia_config.pl $(DEST)/etc/pcmcia/config ../kernel/all.kernels/`cat ../kernel/all.kernels/.main`/modules.dep
 endif
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 2f2727047..43dcbeca6 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -348,7 +348,7 @@ sub insmod {
     if (! -r $f) {
 	die "can not find module $f\n";
     }
-    run_program::run(["/usr/bin/insmod_", "insmod"], "-f", $f, @_) or die("insmod $f failed");
+    run_program::run(["insmod_", "insmod"], "-f", $f, @_) or die("insmod $f failed");
     unlink $f;
 }
 
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index ea3eff5ac..8f50b78e1 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -308,7 +308,7 @@ sub load_raw_install {
 	my $m = '/tmp/' . name2file($_);
 	if (-e $m) {
             my $stdout;
-            my $rc = run_program::run(["/usr/bin/insmod_", "insmod"], '2>', \$stdout, $m, split(' ', $options->{$_}));
+            my $rc = run_program::run(["insmod_", "insmod"], '2>', \$stdout, $m, split(' ', $options->{$_}));
             log::l(chomp_($stdout)) if $stdout;
             if ($rc) {
                 unlink $m;
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