summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-08-24 19:02:16 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-08-24 19:02:16 +0000
commit10b649b6503f47388f1548c8ba9391dd6ce0284e (patch)
tree6bc1fe238a7a28721cfd15b52946e67d236c8277 /perl-install/install_any.pm
parented18d4ad1743445dc1c49d65b5a64a0c73510edd (diff)
downloaddrakx-10b649b6503f47388f1548c8ba9391dd6ce0284e.tar
drakx-10b649b6503f47388f1548c8ba9391dd6ce0284e.tar.gz
drakx-10b649b6503f47388f1548c8ba9391dd6ce0284e.tar.bz2
drakx-10b649b6503f47388f1548c8ba9391dd6ce0284e.tar.xz
drakx-10b649b6503f47388f1548c8ba9391dd6ce0284e.zip
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm21
1 files changed, 4 insertions, 17 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 0560e1016..155f2ef04 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -6,7 +6,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK);
@ISA = qw(Exporter);
%EXPORT_TAGS = (
- all => [ qw(versionString getNextStep doSuspend spawnSync spawnShell addToBeDone) ],
+ all => [ qw(versionString getNextStep spawnSync spawnShell addToBeDone) ],
);
@EXPORT_OK = map { @$_ } values %EXPORT_TAGS;
@@ -40,20 +40,6 @@ sub getNextStep {
$s;
}
-sub doSuspend {
- exit 1 if $::o->{localInstall} || $::testing;
-
- if (my $pid = fork) {
- waitpid $pid, 0;
- } else {
- print "\n\nType <exit> to return to the install program.\n\n";
- exec {"/bin/sh"} "-/bin/sh";
- warn "error execing /bin/sh";
- sleep 5;
- exit 1;
- }
-}
-
sub spawnSync {
return if $::o->{localInstall} || $::testing;
@@ -84,8 +70,9 @@ sub spawnShell {
}
sub mouse_detect() {
- my ($type, $dev) = split("\n", `mouseconfig --nointeractive 2>/dev/null`) or die "mouseconfig failed";
- $type, $dev;
+ my %l;
+ @l{qw(type xtype device)} = split("\n", `mouseconfig --nointeractive 2>/dev/null`) or die "mouseconfig failed";
+ \%l;
}
sub shells($) {