This commit was manufactured by cvs2svn to create branch

'unlabeled-1.1.1'.

1 files changed, 7 insertions, 35 deletions

diff --git a/tools/make_mdkinst_stage2 b/tools/make_mdkinst_stage2
index f480634b2..724808dd7 100755
--- a/tools/make_mdkinst_stage2
+++ b/tools/make_mdkinst_stage2
@@ -13,13 +13,6 @@ REP4PMS=/usr/bin/perl-install
 DEST=$1
 STAGE2=$2
 
-testandset() { [ -x $1/build_archive ] && BUILD_ARCHIVE=$1/build_archive; }
-testandset `pwd`/misc
-testandset `pwd`/.
-testandset /$DEST/../../misc
-testandset `pwd`/$DEST/../../misc
-[ -z "$BUILD_ARCHIVE" ] && { echo "can't find build_archive"; exit 1; }
-
 if [ $EUID != "0" ]; then
     SUDO="sudo"
     PATH="/sbin:/usr/sbin:$PATH"
@@ -29,42 +22,21 @@ $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=24000
-#$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)
-# be sure to keep the biggest server
-rm -f $STAGE2TMP/usr/X11R6/bin/XF86_{VGA16,3DLabs,TGA,S3}
-rm -f $STAGE2TMP/$REP4PMS/po/DrakX.pot
-#for i in /usr/share/locale; do \
-#    name=`basename $i` ; \
-#    (cd $STAGE2TMP/$i ; find * | cpio -o 2>/dev/null | bzip2 > ../$name.cpio.bz2 ; cd .. ; rm -rf $name) \
-#done
-for i in /usr/share/locale; do
-    name=`basename $i`
-    (cd $STAGE2TMP/$i ; find * | $BUILD_ARCHIVE ../$name.cz2 4000000)
-    rm -rf $STAGE2TMP/$i
-done
-for i in /usr/share/keymaps /usr/share/xmodmap $REP4PMS/po; do
-    name=`basename $i`
-    (cd $STAGE2TMP/$i ; ls * | $BUILD_ARCHIVE ../$name.cz2 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 ]
+dd if=/dev/zero of=$STAGE2 bs=1M count=15
 $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 $STAGE2TMP/usr/X11R6/bin/XF86_VGA16
+for i in /usr/share/locale /usr/share/keymaps /usr/share/xmodmap $REP4PMS/po; do \
+	name=`basename $i` ; \
+	(cd $STAGE2TMP/$i ; find * | cpio -o 2>/dev/null | bzip2 > ../$name.cpio.bz2 ; cd .. ; rm -rf $name) \
+done
 $SUDO cp -a $STAGE2TMP/* $MNTPOINT
 $SUDO rm -rf $STAGE2TMP
 
-df $MNTPOINT
 $SUDO umount $STAGE2
 rmdir $MNTPOINT