summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-10-21 14:47:06 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-10-21 14:47:06 +0000
commit1a162cfa19a7030f0d273dcf02ef86b86713533b (patch)
tree87b773ba38a7851f37eccb9ac48b90826e834de6 /perl-install
parent955f1cd34a319d679fee9187c1992ba3c323ba80 (diff)
downloaddrakx-backup-do-not-use-1a162cfa19a7030f0d273dcf02ef86b86713533b.tar
drakx-backup-do-not-use-1a162cfa19a7030f0d273dcf02ef86b86713533b.tar.gz
drakx-backup-do-not-use-1a162cfa19a7030f0d273dcf02ef86b86713533b.tar.bz2
drakx-backup-do-not-use-1a162cfa19a7030f0d273dcf02ef86b86713533b.tar.xz
drakx-backup-do-not-use-1a162cfa19a7030f0d273dcf02ef86b86713533b.zip
*** empty log message ***
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/install_steps_interactive.pm2
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};