summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-06-21 17:41:27 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-06-21 17:41:27 +0000
commit96523a38ffde244945986cdacb24ba88d1614a46 (patch)
tree5cdc691650be935df716621c07bb9fdd54e7b647
parent0630fb8a8bb835e0a8dc1636c789a22c70889779 (diff)
downloaddrakx-96523a38ffde244945986cdacb24ba88d1614a46.tar
drakx-96523a38ffde244945986cdacb24ba88d1614a46.tar.gz
drakx-96523a38ffde244945986cdacb24ba88d1614a46.tar.bz2
drakx-96523a38ffde244945986cdacb24ba88d1614a46.tar.xz
drakx-96523a38ffde244945986cdacb24ba88d1614a46.zip
use busybox for the shell of stage2
-rw-r--r--perl-install/Makefile7
-rw-r--r--perl-install/install_any.pm2
-rw-r--r--perl-install/share/aliases1
-rw-r--r--perl-install/share/list1
-rw-r--r--perl-install/share/list.alpha1
-rw-r--r--perl-install/share/list.ppc1
-rwxr-xr-xtools/i386/busyboxbin0 -> 88223 bytes
7 files changed, 10 insertions, 3 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 5f52bfdee..83609ce44 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -120,6 +120,13 @@ endif
perl -ane 'symlink "$$F[1]", "$(DEST)/usr/bin/$$F[0]"' share/aliases
+ifeq (i386,$(ARCH))
+ cp ../tools/i386/busybox $(DEST)/usr/bin
+ ln -sf busybox $(DEST)/usr/bin/sh
+else
+ ln -sf ash $(DEST)/usr/bin/sh
+endif
+
for i in fonts keyboards locales keymaps; do tar xfj `../tools/specific_arch share/$$i.tar.bz2` -C $(DEST); done
grep ChangeLog CVS/Entries > $(DEST)/usr/share/VERSION
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index b59534205..6650c82f3 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -256,7 +256,7 @@ sub spawnShell {
ioctl(STDIN, c::TIOCSCTTY(), 0) or warn "could not set new controlling tty: $!";
- exec {"/bin/sh"} "-/bin/sh" or log::l("exec of /bin/sh failed: $!");
+ exec "/bin/sh" or log::l("exec of /bin/sh failed: $!");
}
sub fsck_option {
diff --git a/perl-install/share/aliases b/perl-install/share/aliases
index 6710d5e4b..4ff90243d 100644
--- a/perl-install/share/aliases
+++ b/perl-install/share/aliases
@@ -1,5 +1,4 @@
raidstop raidstart
-sh ash
gunzip gzip
install2 perl-install/install2
commands perl-install/commands
diff --git a/perl-install/share/list b/perl-install/share/list
index e62935837..4019ab37d 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -1,4 +1,3 @@
-/bin/ash
/bin/consolechars
/bin/cpio
/bin/gzip
diff --git a/perl-install/share/list.alpha b/perl-install/share/list.alpha
index 81f7dcb0c..da600cc7c 100644
--- a/perl-install/share/list.alpha
+++ b/perl-install/share/list.alpha
@@ -1,3 +1,4 @@
+/bin/ash
/usr/X11R6/bin/XF86_3DLabs
/usr/X11R6/bin/XF86_SVGA
/usr/X11R6/bin/XF86_TGA
diff --git a/perl-install/share/list.ppc b/perl-install/share/list.ppc
index fd74a05f6..fc687b138 100644
--- a/perl-install/share/list.ppc
+++ b/perl-install/share/list.ppc
@@ -1,3 +1,4 @@
+/bin/ash
/usr/bin/hformat
/usr/bin/hmount
/usr/bin/humount
diff --git a/tools/i386/busybox b/tools/i386/busybox
new file mode 100755
index 000000000..0095183b4
--- /dev/null
+++ b/tools/i386/busybox
Binary files differ