diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2000-09-07 17:53:32 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2000-09-07 17:53:32 +0000 |
commit | f2eb42f41d60fbad9150fad5962df90c69713192 (patch) | |
tree | 4c5fb766963350e64bde6f0b8c937b649e9560ea /perl-install/install_steps.pm | |
parent | a1f0c87ac7f98f8555717fd934edf7e706b8694c (diff) | |
download | drakx-f2eb42f41d60fbad9150fad5962df90c69713192.tar drakx-f2eb42f41d60fbad9150fad5962df90c69713192.tar.gz drakx-f2eb42f41d60fbad9150fad5962df90c69713192.tar.bz2 drakx-f2eb42f41d60fbad9150fad5962df90c69713192.tar.xz drakx-f2eb42f41d60fbad9150fad5962df90c69713192.zip |
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r-- | perl-install/install_steps.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 8cde0e12b..0b4430b42 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -791,9 +791,7 @@ sub configureXAfter { } #------------------------------------------------------------------------------ -# miscellaneousNetwork moved to any -#------------------------------------------------------------------------------ -sub miscellaneous { +sub miscellaneousBefore { my ($o) = @_; my %s = getVarsFromSh("$o->{prefix}/etc/sysconfig/system"); @@ -806,6 +804,9 @@ sub miscellaneous { cat_("/proc/cmdline") =~ /.mem=(\S+)/; #- if /^mem/, it means that's the value grub gave add2hash_($o->{miscellaneous} ||= {}, { numlock => !$o->{pcmcia}, $1 ? (memsize => $1) : () }); +} +sub miscellaneous { + my ($o) = @_; local $_ = $o->{bootloader}{perImageAppend}; if (my $ramsize = $o->{miscellaneous}{memsize} and !/mem=/) { |