diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2002-10-09 13:50:21 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2002-10-09 13:50:21 +0000 |
| commit | 5d21ea277f0d19f6c6d4edb8a7dcf018cdce015c (patch) | |
| tree | ce81ed33703f91804f0fbe626b7e1f64a156345e | |
| parent | 09eb60c5e86a607d3e48e78ce9e4d46362bcfa4a (diff) | |
| download | drakx-backup-do-not-use-5d21ea277f0d19f6c6d4edb8a7dcf018cdce015c.tar drakx-backup-do-not-use-5d21ea277f0d19f6c6d4edb8a7dcf018cdce015c.tar.gz drakx-backup-do-not-use-5d21ea277f0d19f6c6d4edb8a7dcf018cdce015c.tar.bz2 drakx-backup-do-not-use-5d21ea277f0d19f6c6d4edb8a7dcf018cdce015c.tar.xz drakx-backup-do-not-use-5d21ea277f0d19f6c6d4edb8a7dcf018cdce015c.zip | |
Let's try a real bash prior to defaulting to perl'ish /bin/sh?
| -rw-r--r-- | perl-install/install_any.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 04f3279a0..9886aedfb 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -246,8 +246,8 @@ sub spawnShell { ioctl(STDIN, c::TIOCSCTTY(), 0) or warn "could not set new controlling tty: $!"; - my $busybox = "/usr/bin/busybox"; - exec { -e $busybox ? $busybox : "/bin/sh" } "/bin/sh" or log::l("exec of /bin/sh failed: $!"); + my ($busybox, $bash) = ("/usr/bin/busybox", "/usr/bin/bash"); + exec { -x $busybox ? $busybox : -x $bash ? $bash : "/bin/sh" } "/bin/sh" or log::l("exec of /bin/sh failed: $!"); } sub getAvailableSpace { @@ -379,7 +379,7 @@ sub setDefaultPackages { $o->{compssUsersChoice}{USB} = 1 if modules::get_probeall("usb-interface"); $o->{compssUsersChoice}{PCMCIA} = 1 if detect_devices::hasPCMCIA(); $o->{compssUsersChoice}{HIGH_SECURITY} = 1 if $o->{security} > 3; - $o->{compssUsersChoice}{BIGMEM} = 1 if !$::oem && (availableRamMB() > 800) && (arch() !~ /ia64/); + $o->{compssUsersChoice}{BIGMEM} = 1 if !$::oem && (availableRamMB() > 800) && (arch() !~ /ia64|x86_64/); $o->{compssUsersChoice}{SMP} = 1 if detect_devices::hasSMP(); $o->{compssUsersChoice}{CDCOM} = 1 if grep { $_->{descr} =~ /commercial/i } values %{$o->{packages}{mediums}}; $o->{compssUsersChoice}{'3D'} = 1 if |