summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-03-24 10:47:46 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-03-25 08:05:39 +0100
commit55bc7ba0df2271059a114c6621c429ff96c44149 (patch)
tree895ed88654eabdbed70f82bd5445cf0e53e8aba7
parenta7fffb36b7e374e33192a1f6b650f7451a713a54 (diff)
downloaddrakx-55bc7ba0df2271059a114c6621c429ff96c44149.tar
drakx-55bc7ba0df2271059a114c6621c429ff96c44149.tar.gz
drakx-55bc7ba0df2271059a114c6621c429ff96c44149.tar.bz2
drakx-55bc7ba0df2271059a114c6621c429ff96c44149.tar.xz
drakx-55bc7ba0df2271059a114c6621c429ff96c44149.zip
perl_checker cleanups + kill unused variable
-rw-r--r--perl-install/bootloader.pm5
-rw-r--r--perl-install/common.pm4
2 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 3204aa194..5d6714b0e 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -150,8 +150,7 @@ sub kernel_str2initrd_short {
basename2initrd_basename(kernel_str2short_name($kernel)) . '.img';
}
}
-sub kernel_str2liblinux_short {
- my ($kernel) = @_;
+sub kernel_str2liblinux_short() {
$liblinux_path;
}
@@ -1055,7 +1054,7 @@ sub add_kernel {
}
if ($v->{liblinux}) {
- $v->{liblinux} = kernel_str2liblinux_short($kernel_str);
+ $v->{liblinux} = kernel_str2liblinux_short();
_do_the_symlink($bootloader, $v->{liblinux}, basename($liblinux_long));
}
}
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 265f7365c..72ae44d6e 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -735,7 +735,7 @@ Returns the short name of the UEFI machine type supported by the kernel stub loa
sub kernel_uefi_type() {
my $arch = arch();
if ($arch eq 'aarch64') {
- return 'aa64'
+ return 'aa64';
}
$arch =~ /i.86/ ? 'ia32' : 'x64';
}
@@ -748,7 +748,7 @@ Returns the UEFI machine type short name
sub uefi_type() {
if (arch() eq 'aarch64') {
- return 'aa64'
+ return 'aa64';
}
if (-e '/sys/firmware/efi/fw_platform_size') {
cat_('/sys/firmware/efi/fw_platform_size') =~ /32/ ? 'ia32' : 'x64';