From 1af3127bb909ab5487d475c4688f432d44ae3f9e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 22 May 2015 23:44:29 +0200
Subject: perl_checker cleanups

---
 images/make_boot_img | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'images/make_boot_img')

diff --git a/images/make_boot_img b/images/make_boot_img
index 814308a06..c0cdf55f0 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -14,15 +14,11 @@ my $default_acpi = '';
 my $default_vga = "vga=788 splash quiet";
 my $default_iswmd = "noiswmd";
 my $timeout = $ENV{BOOT_AUTOMATIC_METHOD} ? 5 : 150;
-my $lib = $arch eq 'x86_64' ? 'lib64' : 'lib';
 my $isolinux_bin = '/usr/lib/syslinux/isolinux.bin';
 
 my $tmp_mnt = '/tmp/drakx_mnt';
-my $tmp_initrd = '/tmp/drakx_initrd';
 
-my $sudo;
 if ($>) {
-    $sudo = "sudo";
     $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}";
 }
 
@@ -150,7 +146,6 @@ sub initrd {
     my ($type, $I, $img, $kernel) = @_;
     my $stage1_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/stage1`) : "";
     my $init_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/init`) : "";
-    my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)";
     my $modules = " mgainstaller ";
     my $drivers = `perl ../kernel/modules.pl list_needed_modules $kernel | xargs`;
     my $fakedrivers = `perl ../kernel/modules.pl list_fake_modules $kernel | xargs`;
@@ -199,7 +194,7 @@ sub syslinux_cfg_all {
 	    { kernel => "$arch/vmlinuz", initrd => "$arch/all.rdz", %$_ };
 	} entries_append($type)),
 	(map_index {
-	    { label => "$arch", kernel => "$arch/vmlinuz", initrd => "$arch/all.rdz", 
+	    { label => $arch, kernel => "$arch/vmlinuz", initrd => "$arch/all.rdz", 
 	      append => join(' ', grep { $_ } $default_append, $default_acpi, $default_vga, $default_iswmd) };
 	} @kernels),
 	{ label => 'memtest', kernel => 'memtest' },
@@ -342,7 +337,7 @@ sub boot_iso {
     output('.boot_iso/isolinux/isolinux.cfg', syslinux_cfg_all('', $with_gfxboot));
 
     if ($ENV{BOOT_AUTOMATIC_METHOD}) {
-        _ "sed -i 's#\\(append .*\\)\\(splash quiet\\|rescue\\)\$#\\1\\2 automatic=$ENV{BOOT_AUTOMATIC_METHOD}#' .boot_iso/isolinux/isolinux.cfg"
+        _ "sed -i 's#\\(append .*\\)\\(splash quiet\\|rescue\\)\$#\\1\\2 automatic=$ENV{BOOT_AUTOMATIC_METHOD}#' .boot_iso/isolinux/isolinux.cfg";
     }
 
     my $arch = arch();
-- 
cgit v1.2.1