summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-10-18 17:08:59 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-10-18 17:08:59 +0000
commit0e4f05d46881f2bb726eac3580ae783f62d45015 (patch)
tree0128596419c279154dcd8d457eea1d7c08539059
parentfe63f41573eaad71f256684c1c745333e4d42088 (diff)
downloaddrakx-0e4f05d46881f2bb726eac3580ae783f62d45015.tar
drakx-0e4f05d46881f2bb726eac3580ae783f62d45015.tar.gz
drakx-0e4f05d46881f2bb726eac3580ae783f62d45015.tar.bz2
drakx-0e4f05d46881f2bb726eac3580ae783f62d45015.tar.xz
drakx-0e4f05d46881f2bb726eac3580ae783f62d45015.zip
no_comment
-rw-r--r--docs/diskdrake.TODO2
-rw-r--r--perl-install/Makefile7
-rw-r--r--perl-install/fsedit.pm2
3 files changed, 4 insertions, 7 deletions
diff --git a/docs/diskdrake.TODO b/docs/diskdrake.TODO
index 0a5fd6db2..e6f2da038 100644
--- a/docs/diskdrake.TODO
+++ b/docs/diskdrake.TODO
@@ -5,7 +5,6 @@
- the information put in save/restore partitions must be cleaned
(remove mounted/formatted/..., also remove the Data::Dumper dependency)
- test, test, test
-- integrate ext2resize
- do not allow swap partitions above 2Gigs
- wanting the first partition to be extended is not used
- maybe warn if a mounted partition change of dev number
@@ -13,7 +12,6 @@
- better error handling (what to do if we find a bad partition table?)
- display the information about the correspondance color2type
- handle the partition labels (missing information here)
-- have ``undo''
- add comments in the code
- add documentation
- handle the `luke' case (main extended partition must be extended)
diff --git a/perl-install/Makefile b/perl-install/Makefile
index c6cd2bf6d..e0a4e91d2 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -38,8 +38,8 @@ floppy:
tar-diskdrake: clean pci_probing
cd .. ; rm -rf diskdrake ; cp -af perl-install diskdrake
- l=`./perl2fcalls -uses -excludec diskdrake | sort | uniq | sed -e 's/::/\//' -e 's/^/diskdrake\//' -e 's/$$/.pm/'` ; \
- cd .. ; tar cfz diskdrake.tgz --exclude CVS $(patsubst %,diskdrake/%,c po diskdrake*) $$l
+ l=`./perl2fcalls -uses -excludec -excluderesize_fat::c_rewritten diskdrake | sort | uniq | grep -v "^resize_fat::" | sed -e 's/::/\//' -e 's/^/diskdrake\//' -e 's/$$/.pm/'` ; \
+ cd .. ; tar cfz diskdrake.tgz --exclude CVS $(patsubst %,diskdrake/%,c c.pm resize_fat po diskdrake*) $$l
tar-XFdrake: clean
cd .. ; rm -rf XFdrake ; cp -af perl-install XFdrake
@@ -52,7 +52,7 @@ $(DIRS):
$(MAKE) -C $@
test_pms: verify_c
- ./perl2fcalls -excludec install2
+ ./perl2fcalls -excludec -excluderesize_fat::c_rewritten install2
perl -cw -I. -Ic -Ic/blib/arch install2
perl -cw -I. -Ic -Ic/blib/arch install_steps_graphical.pm
@@ -78,7 +78,6 @@ install_pms: $(DIRS)
perl -ne 'print' $$i > $(DESTREP4PMS)/$$i; \
done
# perl -ne 's/\s*#-.*//; print unless (/^=head/ .. /^=cut/) || /use (diagnostics|vars|strict)/' $$i > $(DESTREP4PMS)/$$i; \
-# /
cp *.rc $(DESTREP4PMS)
install -d $(DESTREP4PMS)/po
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 5954f3113..75e43eea2 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -192,7 +192,7 @@ sub removeFromList($$$) {
$end > $list->[$i + 1] and die $err;
if ($end == $list->[$i + 1]) {
#- the free block is just the same size, removing it
- splice(@$list, 0, 2);
+ splice(@$list, $i, 2);
} else {
#- the free block now start just after this block
$list->[$i] = $end;