diff options
author | Chmouel Boudjnah <chmou@mandriva.com> | 2002-02-11 16:19:07 +0000 |
---|---|---|
committer | Chmouel Boudjnah <chmou@mandriva.com> | 2002-02-11 16:19:07 +0000 |
commit | 8a0a96856ee1ca533d908a5d8fc50a89edec8acf (patch) | |
tree | 888fda03d609d14c93304df0781a760103e32201 /scripts | |
parent | 69b4611b572aa94417aebf115961186cb3269b57 (diff) | |
download | bootsplash-8a0a96856ee1ca533d908a5d8fc50a89edec8acf.tar bootsplash-8a0a96856ee1ca533d908a5d8fc50a89edec8acf.tar.gz bootsplash-8a0a96856ee1ca533d908a5d8fc50a89edec8acf.tar.bz2 bootsplash-8a0a96856ee1ca533d908a5d8fc50a89edec8acf.tar.xz bootsplash-8a0a96856ee1ca533d908a5d8fc50a89edec8acf.zip |
Exist if the config file doen't exist, don't get information from cmdline when we are during instal
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/detect-resolution | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/detect-resolution b/scripts/detect-resolution index dad066e..d659b07 100755 --- a/scripts/detect-resolution +++ b/scripts/detect-resolution @@ -11,7 +11,9 @@ my (%main, %entry); my $vga = detect_from_cmdline(cat_('/proc/cmdline')); +undef $vga if $ENV{'DURING_INSTALL'} and $vga; #Nothing from Install cmdline. undef $vga if $vga =~ /x/; #lilo cmdline can't convert + detect_from_loader() if not $vga; if ($vga) { chomp $vga; @@ -36,6 +38,7 @@ sub parse_grub_conf { my ($title); my $cnt = 0; my $grub_conf = "/boot/grub/menu.lst"; + return if not -f $grub_conf; open F, $grub_conf or die "Can't open $grub_conf\n"; while (<F>) { @@ -61,6 +64,7 @@ sub parse_grub_conf { sub parse_lilo_conf { my $lilo_conf="/etc/lilo.conf"; my ($vga, $label); + return if not -f $lilo_conf; open F, $lilo_conf or die "Can't open $lilo_conf\n"; while (<F>) { next if /^\s*#/; |