From 1a162cfa19a7030f0d273dcf02ef86b86713533b Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 21 Oct 1999 14:47:06 +0000 Subject: *** empty log message *** --- perl-install/Makefile | 2 +- perl-install/install_steps_interactive.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/Makefile b/perl-install/Makefile index e79fefc65..fa479d9f8 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -76,7 +76,7 @@ install_pms: $(DIRS) dest=$(DESTREP4PMS)/`dirname $$i`; \ install -d $$dest; \ perl -ne 'print' $$i > $(DESTREP4PMS)/$$i; \ - perl -ne 's/#-.*//; print unless (/^=head/ .. /^=cut/) || /use (diagnostics|vars|strict)/' $$i > $(DESTREP4PMS)/$$i; \ + perl -pe 's/#-.*//; $$_ = "\n" if (/^=head/ .. /^=cut/) || /use (diagnostics|vars|strict)/' $$i > $(DESTREP4PMS)/$$i; \ done cp *.rc $(DESTREP4PMS) diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index b5e430f7c..0d9db4ae9 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -599,7 +599,7 @@ sub setupBootloader { my ($o, $more) = @_; my $b = $o->{bootloader}; - if ($::beginner && ($more == 1 || $b->{bootUnsafe})) { + if ($::beginner && $more == ($b->{bootUnsafe} ? 0 : 1)) { my @l = (__("First sector of drive (MBR)"), __("First sector of boot partition")); my $boot = $o->{hds}[0]{device}; -- cgit v1.2.1