summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig/various.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-09 03:05:53 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-09 03:05:53 +0000
commit19a10e98f556ee3ce47831364ae45c044329b45f (patch)
tree8a25e60167dd641c7f509ad9c843f2c33d8225d1 /perl-install/Xconfig/various.pm
parent839685f9f74d3b6cd1a8ad8f12b83b7fc63f56c9 (diff)
downloaddrakx-19a10e98f556ee3ce47831364ae45c044329b45f.tar
drakx-19a10e98f556ee3ce47831364ae45c044329b45f.tar.gz
drakx-19a10e98f556ee3ce47831364ae45c044329b45f.tar.bz2
drakx-19a10e98f556ee3ce47831364ae45c044329b45f.tar.xz
drakx-19a10e98f556ee3ce47831364ae45c044329b45f.zip
- adapt prototype of runlevel() to its use
- bootloader::read() needs fstab
Diffstat (limited to 'perl-install/Xconfig/various.pm')
-rw-r--r--perl-install/Xconfig/various.pm11
1 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm
index 3a961aa7d..25e04e87a 100644
--- a/perl-install/Xconfig/various.pm
+++ b/perl-install/Xconfig/various.pm
@@ -53,11 +53,11 @@ sub various {
}
sub runlevel {
- my ($runlevel) = @_;
+ my ($o_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;
+ if ($o_runlevel) {
+ substInFile { s/^id:\d:initdefault:\s*$/id:$o_runlevel:initdefault:\n/ } $f if !$::testing;
} else {
cat_($f) =~ /^id:(\d):initdefault:\s*$/m && $1;
}
@@ -131,9 +131,8 @@ sub configure_FB_TVOUT {
require bootloader;
require fsedit;
require detect_devices;
- my ($bootloader, $all_hds) =
- $::isInstall ? ($::o->{bootloader}, $::o->{all_hds}) :
- (bootloader::read(), fsedit::get_hds());
+ my $all_hds = $::isInstall ? $::o->{all_hds} : fsedit::get_hds();
+ my $bootloader = $::isInstall ? $::o->{bootloader} : bootloader::read(fs::get::fstab($all_hds));
if (my $tvout = bootloader::duplicate_kernel_entry($bootloader, 'TVout')) {
$tvout->{append} .= " XFree=tvout";