diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-23 08:11:22 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-23 08:11:22 +0000 |
| commit | 10a091cefa1c04f8b29f887a93673932e7ea2178 (patch) | |
| tree | b32ffea5402a11f3b7ed3d20f060d3152be25086 /perl-install/standalone/drakboot | |
| parent | f9f468c33ab20cc27cabe33bdb52f8d520f6db5f (diff) | |
| download | drakx-10a091cefa1c04f8b29f887a93673932e7ea2178.tar drakx-10a091cefa1c04f8b29f887a93673932e7ea2178.tar.gz drakx-10a091cefa1c04f8b29f887a93673932e7ea2178.tar.bz2 drakx-10a091cefa1c04f8b29f887a93673932e7ea2178.tar.xz drakx-10a091cefa1c04f8b29f887a93673932e7ea2178.zip | |
- fix processing of config file broken by magic olivier
- reuse cat_()
Diffstat (limited to 'perl-install/standalone/drakboot')
| -rwxr-xr-x | perl-install/standalone/drakboot | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index 50afc3429..128a66fe3 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -106,15 +106,12 @@ my $splash_mode = !$no_bootsplash; my $keep_logo = 1; if (-r $themes{sysconfig}) { - my $SYSF; - open $SYSF, $themes{sysconfig} or die "Can't open $themes{sysconfig}\n"; - while (<$SYSF>) { - local $_; + local $_; + while (cat_("$themes{sysconfig}") { /^SPLASH=no/ and $splash_mode = 0; /^THEME=(.*)/ and -f "$themes{path}$1$themes{boot}{path}bootsplash-$cur_res.jpg" and $themes{default} = $1; /^LOGO_CONSOLE=(.*)/ and $keep_logo = $1 ne 'no'; } - close($SYSF); } my @boot_thms = if_(!$themes{default}, qw(default)); |