summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-09 09:49:41 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-09 09:49:41 +0000
commit1cfe6c79ba71ee10522049af62e959b79cd7c9ed (patch)
tree9c2e0d3a9e9b5878eb88bcc2be555f1b7292459b
parent1d3ac921d66022bb6e19a96dce95472cc31f0987 (diff)
downloaddrakx-backup-do-not-use-1cfe6c79ba71ee10522049af62e959b79cd7c9ed.tar
drakx-backup-do-not-use-1cfe6c79ba71ee10522049af62e959b79cd7c9ed.tar.gz
drakx-backup-do-not-use-1cfe6c79ba71ee10522049af62e959b79cd7c9ed.tar.bz2
drakx-backup-do-not-use-1cfe6c79ba71ee10522049af62e959b79cd7c9ed.tar.xz
drakx-backup-do-not-use-1cfe6c79ba71ee10522049af62e959b79cd7c9ed.zip
no_comment
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/partition_table.pm6
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 6b3f998c6..9fe3affe3 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -78,7 +78,7 @@ install_pms: all
for i in $(PMS); do \
dest=$(DESTREP4PMS)/`dirname $$i`; \
install -d $$dest; \
- perl -ne 'print unless (/^=head/ .. /^=cut/) || /#-.*/' $$i > $(DESTREP4PMS)/$$i; \
+ perl -ne 's/\s*#-.*//; print unless (/^=head/ .. /^=cut/)' $$i > $(DESTREP4PMS)/$$i; \
done
# || /use (diagnostics|vars|strict)/
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 65b084f21..94c17b815 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -358,7 +358,7 @@ sub add_extended($$) {
my $e = $hd->{primary}{extended};
if ($e && !verifyInside($part, $e)) {
- #ie "sorry, can't add outside the main extended partition" unless $::unsafe;
+ #-die "sorry, can't add outside the main extended partition" unless $::unsafe;
my $end = $e->{start} + $e->{size};
my $start = min($e->{start}, $part->{start});
$end = max($end, $part->{start} + $part->{size}) - $start;
@@ -377,12 +377,12 @@ The only solution is to move your primary partitions to have the hole next to th
my $l = first (@{$hd->{extended}});
- # the first is a special case, must recompute its real size
+ #- the first is a special case, must recompute its real size
$l->{start} = round_down($l->{normal}{start} - 1, cylinder_size($hd));
$l->{size} = $l->{normal}{start} + $l->{normal}{size} - $l->{start};
my $ext = { %$l };
unshift @{$hd->{extended}}, { type => 5, raw => [ $part, $ext, {}, {} ], normal => $part, extended => $ext };
- # size will be autocalculated :)
+ #- size will be autocalculated :)
} else {
my ($ext, $ext_size) = is_empty_array_ref($hd->{extended}) ?