diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2002-11-14 17:36:32 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2002-11-14 17:36:32 +0000 |
commit | 78e8097c578fb334c7440a5459fdb7aecc827feb (patch) | |
tree | 365a303dd0143c940451e55df0316b3aaf6c0a67 /perl-install/bootloader.pm | |
parent | 0321ff25b57d94626c9a5c2d02fbdb5448474fc6 (diff) | |
download | drakx-78e8097c578fb334c7440a5459fdb7aecc827feb.tar drakx-78e8097c578fb334c7440a5459fdb7aecc827feb.tar.gz drakx-78e8097c578fb334c7440a5459fdb7aecc827feb.tar.bz2 drakx-78e8097c578fb334c7440a5459fdb7aecc827feb.tar.xz drakx-78e8097c578fb334c7440a5459fdb7aecc827feb.zip |
- add/remove spaces to make perl_checker happy
- remove redundant parentheses
- add some parentheses for clarity
Diffstat (limited to 'perl-install/bootloader.pm')
-rw-r--r-- | perl-install/bootloader.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index e13f250aa..81737f4c8 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -631,7 +631,7 @@ sub install_yaboot { if ($_->{type} eq "image") { my $of_dev = ''; - if (($boot !~ /$_->{root}/) && $boot) { + if ($boot !~ /$_->{root}/ && $boot) { $of_dev = get_of_dev($boot); print F "$_->{type}=$of_dev," . substr($_->{kernel_or_dev}, 5); } else { @@ -640,7 +640,7 @@ sub install_yaboot { } print F "\tlabel=", substr($_->{label}, 0, 15); #- lilo doesn't handle more than 15 char long labels print F "\troot=$_->{root}"; - if (($boot !~ /$_->{root}/) && $boot) { + if ($boot !~ /$_->{root}/ && $boot) { print F "\tinitrd=$of_dev," . substr($_->{initrd}, 5) if $_->{initrd}; } else { print F "\tinitrd=$of_dev,$_->{initrd}" if $_->{initrd}; @@ -732,8 +732,8 @@ sub install_silo { } log::l("Installing boot loader..."); $::testing and return; - run_program::rooted($::prefix, "silo", "2>", "/tmp/.error", $silo->{use_partition} ? ("-t") : ()) or - run_program::rooted_or_die($::prefix, "silo", "2>", "/tmp/.error", "-p", "2", $silo->{use_partition} ? ("-t") : ()); + run_program::rooted($::prefix, "silo", "2>", "/tmp/.error", $silo->{use_partition} ? "-t" : ()) or + run_program::rooted_or_die($::prefix, "silo", "2>", "/tmp/.error", "-p", "2", $silo->{use_partition} ? "-t" : ()); unlink "$::prefix/tmp/.error"; #- try writing in the prom. |