diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-10-10 08:59:18 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-10-10 08:59:18 +0000 |
| commit | 3857b5ebc1e3c033eb03fcfaac11350fe3d3ed85 (patch) | |
| tree | d842c8453b822613cf53d49c856dfb38b6520275 /perl-install/install_any.pm | |
| parent | a3ee0caf9a3c8e509b7487d3068c9c2a50f2d864 (diff) | |
| download | drakx-3857b5ebc1e3c033eb03fcfaac11350fe3d3ed85.tar drakx-3857b5ebc1e3c033eb03fcfaac11350fe3d3ed85.tar.gz drakx-3857b5ebc1e3c033eb03fcfaac11350fe3d3ed85.tar.bz2 drakx-3857b5ebc1e3c033eb03fcfaac11350fe3d3ed85.tar.xz drakx-3857b5ebc1e3c033eb03fcfaac11350fe3d3ed85.zip | |
aaaah that's why I had all the stuff done twice after shell could not be run :)
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 75f2f58c5..61a50d50f 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -206,11 +206,11 @@ sub spawnShell() { $ENV{DISPLAY} ||= ":0"; #- why not :pp local *F; - sysopen F, "/dev/tty2", 2 or die "cannot open /dev/tty2 -- no shell will be provided: $!"; + sysopen F, "/dev/tty2", 2 or log::l("cannot open /dev/tty2 -- no shell will be provided: $!"), goto cant_spawn; - open STDIN, "<&F" or die ''; - open STDOUT, ">&F" or die ''; - open STDERR, ">&F" or die ''; + open STDIN, "<&F" or goto cant_spawn; + open STDOUT, ">&F" or goto cant_spawn; + open STDERR, ">&F" or goto cant_spawn; close F; print any::drakx_version(), "\n"; @@ -225,7 +225,10 @@ sub spawnShell() { my $program_name = /busybox/ ? "/bin/sh" : $_; #- since perl_checker is too dumb exec { $_ } $program_name, @args or log::l("exec of $_ failed: $!"); } - die "cannot open shell"; + + log::l("cannot open any shell"); +cant_spawn: + c::_exit(1); } sub getAvailableSpace { |