diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-12-31 10:39:43 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2022-01-05 15:34:30 +0100 |
| commit | 08b1d3996f89d923fc16dd7f60434d66955c162a (patch) | |
| tree | fc6f7fc82f50be85b460a2d890be496c262eee9e /perl-install | |
| parent | 96f3c6f4744186ab84044b52ba760ad80da987a4 (diff) | |
| download | drakx-08b1d3996f89d923fc16dd7f60434d66955c162a.tar drakx-08b1d3996f89d923fc16dd7f60434d66955c162a.tar.gz drakx-08b1d3996f89d923fc16dd7f60434d66955c162a.tar.bz2 drakx-08b1d3996f89d923fc16dd7f60434d66955c162a.tar.xz drakx-08b1d3996f89d923fc16dd7f60434d66955c162a.zip | |
perl_checker cleanups
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/install2.pm | 4 | ||||
| -rw-r--r-- | perl-install/install/steps.pm | 2 |
2 files changed, 3 insertions, 3 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; } } |