summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-12-31 10:39:43 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2022-01-05 15:34:30 +0100
commit08b1d3996f89d923fc16dd7f60434d66955c162a (patch)
treefc6f7fc82f50be85b460a2d890be496c262eee9e
parent96f3c6f4744186ab84044b52ba760ad80da987a4 (diff)
downloaddrakx-08b1d3996f89d923fc16dd7f60434d66955c162a.tar
drakx-08b1d3996f89d923fc16dd7f60434d66955c162a.tar.gz
drakx-08b1d3996f89d923fc16dd7f60434d66955c162a.tar.bz2
drakx-08b1d3996f89d923fc16dd7f60434d66955c162a.tar.xz
drakx-08b1d3996f89d923fc16dd7f60434d66955c162a.zip
perl_checker cleanups
-rw-r--r--perl-install/install/install2.pm4
-rw-r--r--perl-install/install/steps.pm2
-rwxr-xr-xrescue/bin/guessmounts2
3 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 3fea4f0ce..de48a6dbb 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -400,7 +400,7 @@ sub init_local_install {
push @::auto_steps,
# 'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass',
'doPartitionDisks', 'formatPartitions';
- eval { fs::mount::sys_kernel_debug(''); }; #- do it now so that when_load doesn't do it
+ eval { fs::mount::sys_kernel_debug('') }; #- do it now so that when_load doesn't do it
$o->{nomouseprobe} = 1;
$o->{mouse} = mouse::fullname2mouse('Universal|Any PS/2 & USB mice');
}
@@ -703,7 +703,7 @@ sub main {
$o->{stage2_phys_medium} = install::media::stage2_phys_medium($o->{method});
if (-e '/tmp/media/DATE.txt') {
- my @mount_entry = grep { $_ =~ m,/tmp/media, } cat_('/proc/mounts');
+ my @mount_entry = grep { m,/tmp/media, } cat_('/proc/mounts');
my @mount_fields = split(/ /, $mount_entry[0]);
log::l(run_program::get_stdout('blkid', '-s', 'LABEL', $mount_fields[0]));
log::l('ISO date: ' . cat_('/tmp/media/DATE.txt'));
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 285feb8a9..f19b8acc2 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -713,7 +713,7 @@ sub configureTimezone {
my $pkg = install::pkgs::packageByName($o->{packages}, 'chrony');
unless ($pkg && $pkg->flag_installed) {
$pkg = install::pkgs::packageByName($o->{packages}, 'ntp');
- $o->pkg_install('chrony') unless ($pkg && $pkg->flag_installed);
+ $o->pkg_install('chrony') unless $pkg && $pkg->flag_installed;
}
}
diff --git a/rescue/bin/guessmounts b/rescue/bin/guessmounts
index c5dc5996b..35da03cb0 100755
--- a/rescue/bin/guessmounts
+++ b/rescue/bin/guessmounts
@@ -68,7 +68,7 @@ if (@$luks_parts) {
my $all_hds = fsedit::get_hds({}, $in);
# Unlocking them in order to look at their fs (do they hold a Mageia installation):
foreach my $part (@$luks_parts) {
- diskdrake::interactive::dmcrypt_open($in, undef, $part, $all_hds)
+ diskdrake::interactive::dmcrypt_open($in, undef, $part, $all_hds);
}
my @dmcrypts = fs::dmcrypt::get_existing(@$luks_parts);
push @$normal_parts, @dmcrypts;