diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-07-04 13:42:24 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-07-04 13:42:24 +0000 |
| commit | 4b281853d9b10f46d8d3799807d67c0f8cfe835c (patch) | |
| tree | 3a3b5b7f94e79720a0e9eda726869883d99ba4a1 | |
| parent | 2ddea4c4ff73b19afac4567bfbe09f9ffeed9055 (diff) | |
| download | drakx-4b281853d9b10f46d8d3799807d67c0f8cfe835c.tar drakx-4b281853d9b10f46d8d3799807d67c0f8cfe835c.tar.gz drakx-4b281853d9b10f46d8d3799807d67c0f8cfe835c.tar.bz2 drakx-4b281853d9b10f46d8d3799807d67c0f8cfe835c.tar.xz drakx-4b281853d9b10f46d8d3799807d67c0f8cfe835c.zip | |
remove busybox as default shell. Only use it as the interactive shell on tty2
| -rw-r--r-- | perl-install/Makefile | 4 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 3 | ||||
| -rw-r--r-- | perl-install/share/list | 1 | ||||
| -rw-r--r-- | perl-install/share/list.alpha | 1 | ||||
| -rw-r--r-- | perl-install/share/list.ppc | 1 | ||||
| -rw-r--r-- | perl-install/share/list.sparc | 1 |
6 files changed, 4 insertions, 7 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 83609ce44..6516cf674 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -122,10 +122,8 @@ endif 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 + ln -sf ash $(DEST)/usr/bin/sh for i in fonts keyboards locales keymaps; do tar xfj `../tools/specific_arch share/$$i.tar.bz2` -C $(DEST); done diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 8bbc30fde..de879b172 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -256,7 +256,8 @@ sub spawnShell { ioctl(STDIN, c::TIOCSCTTY(), 0) or warn "could not set new controlling tty: $!"; - exec "/bin/sh" or log::l("exec of /bin/sh failed: $!"); + my $busybox = "/usr/bin/busybox"; + exec {-e $busybox ? $busybox : "/bin/sh"} "/bin/sh" or log::l("exec of /bin/sh failed: $!"); } sub fsck_option { diff --git a/perl-install/share/list b/perl-install/share/list index 80d458b25..f9973306c 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -1,3 +1,4 @@ +/bin/ash /bin/consolechars /bin/cpio /bin/gzip diff --git a/perl-install/share/list.alpha b/perl-install/share/list.alpha index 4ddcb76e9..860cd1e27 100644 --- a/perl-install/share/list.alpha +++ b/perl-install/share/list.alpha @@ -1,6 +1,5 @@ /sbin/ifport /sbin/mkdosfs -/bin/ash /usr/X11R6/bin/XF86_FBDev /usr/X11R6/bin/XF86_VGA16 /usr/X11R6/bin/XF86_3DLabs diff --git a/perl-install/share/list.ppc b/perl-install/share/list.ppc index fc687b138..fd74a05f6 100644 --- a/perl-install/share/list.ppc +++ b/perl-install/share/list.ppc @@ -1,4 +1,3 @@ -/bin/ash /usr/bin/hformat /usr/bin/hmount /usr/bin/humount diff --git a/perl-install/share/list.sparc b/perl-install/share/list.sparc index 3510716a4..da9f7ba52 100644 --- a/perl-install/share/list.sparc +++ b/perl-install/share/list.sparc @@ -1,4 +1,3 @@ -/bin/ash /bin/cpio /lib/libnss_nis.so.2 /lib/libnss_files.so.2 |