summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-12-02 17:33:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-12-02 17:33:54 +0000
commitfcbb83d441156725da382c030d75ab91b148ac87 (patch)
treed2dd94870cca3af168f9b4130f3a06081ad02fe9
parent22e857958eeb3ee4a4b1843268992aa8814ef7e4 (diff)
downloaddrakx-fcbb83d441156725da382c030d75ab91b148ac87.tar
drakx-fcbb83d441156725da382c030d75ab91b148ac87.tar.gz
drakx-fcbb83d441156725da382c030d75ab91b148ac87.tar.bz2
drakx-fcbb83d441156725da382c030d75ab91b148ac87.tar.xz
drakx-fcbb83d441156725da382c030d75ab91b148ac87.zip
any::runlevel() doesnt need the prefix anymore
-rw-r--r--perl-install/any.pm4
-rw-r--r--perl-install/install_steps.pm2
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 0b7debaf8..b61cb2849 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -880,8 +880,8 @@ sub set_login_serial_console {
sub runlevel {
- my ($prefix, $runlevel) = @_;
- my $f = "$prefix/etc/inittab";
+ my ($runlevel) = @_;
+ my $f = "$::prefix/etc/inittab";
-r $f or log::l("missing inittab!!!"), return;
if ($runlevel) {
substInFile { s/^id:\d:initdefault:\s*$/id:$runlevel:initdefault:\n/ } $f if !$::testing;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 659ec72ac..cbd6cbc85 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -936,7 +936,7 @@ sub configureXAfter {
if ($o->{X}{bios_vga_mode}) {
install_any::setupFB($o, $o->{X}{bios_vga_mode}) or do {
log::l("disabling automatic start-up of X11 if any as setup framebuffer failed");
- any::runlevel($o->{prefix}, 3); #- disable automatic start-up of X11 on error.
+ any::runlevel(3); #- disable automatic start-up of X11 on error.
};
}
if ($o->{X}{default_depth} >= 16 && $o->{X}{resolution_wanted} >= 1024) {