From ede63b3b0df1883f368711a6ca6746455d2a4076 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 27 Jan 2000 14:03:35 +0000
Subject: no_comment

---
 tools/Makefile            |  2 +-
 tools/make_mdkinst_stage2 | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'tools')

diff --git a/tools/Makefile b/tools/Makefile
index cfc861723..cf75c866c 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -38,4 +38,4 @@ $(BASE)/hdlist: $(RPMS)
 
 clean: 
 	for i in $(DIRS); do $(MAKE) -C $$i clean; done
-	rm -rf *~ gendepslist rpm2header ddcprobe/ddcxinfos */*.o
+	rm -rf *~ gendepslist xhost+ rpm2header ddcprobe/ddcxinfos */*.o
diff --git a/tools/make_mdkinst_stage2 b/tools/make_mdkinst_stage2
index 7652317be..b68826fba 100755
--- a/tools/make_mdkinst_stage2
+++ b/tools/make_mdkinst_stage2
@@ -29,12 +29,6 @@ $SUDO rm -rf $STAGE2TMP
 install -d $STAGE2TMP
 $SUDO cp -a $DEST/* $STAGE2TMP
 
-mkdir -p $MNTPOINT 2>/dev/null
-for i in $MNTPOINT $STAGE2; do $SUDO umount $i 2>/dev/null ; done
-dd if=/dev/zero of=$STAGE2 bs=1k count=18000
-$MKE2FS -N 1000 $STAGE2
-$SUDO mount -t ext2 $STAGE2 $MNTPOINT -o loop
-
 # hack to reduce the STAGE2 image (do not edit without modifying in DrakX)
 rm -f $STAGE2TMP/usr/X11R6/bin/XF86_VGA16
 rm -f $STAGE2TMP/$REP4PMS/po/DrakX.pot
@@ -47,7 +41,15 @@ for i in /usr/share/keymaps /usr/share/xmodmap $REP4PMS/po; do
     (cd $STAGE2TMP/$i ; ls * | $BUILD_ARCHIVE ../$name 400000)
     rm -rf $STAGE2TMP/$i
 done
+
+
 	
+mkdir -p $MNTPOINT 2>/dev/null
+for i in $MNTPOINT $STAGE2; do $SUDO umount $i 2>/dev/null ; done
+dd if=/dev/zero of=$STAGE2 bs=1k count=$[ `du -s $STAGE2TMP | cut -f1` + 1024 ]
+$MKE2FS -N 1000 $STAGE2
+$SUDO mount -t ext2 $STAGE2 $MNTPOINT -o loop
+
 $SUDO cp -a $STAGE2TMP/* $MNTPOINT
 $SUDO rm -rf $STAGE2TMP
 
-- 
cgit v1.2.1