summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-01-27 14:03:35 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-01-27 14:03:35 +0000
commitede63b3b0df1883f368711a6ca6746455d2a4076 (patch)
treed92b70d43c6a124e7f108a03f7de527ef0b83e0a /tools
parent28ef5814f5973e134faec194e952bbbe297a732b (diff)
downloaddrakx-ede63b3b0df1883f368711a6ca6746455d2a4076.tar
drakx-ede63b3b0df1883f368711a6ca6746455d2a4076.tar.gz
drakx-ede63b3b0df1883f368711a6ca6746455d2a4076.tar.bz2
drakx-ede63b3b0df1883f368711a6ca6746455d2a4076.tar.xz
drakx-ede63b3b0df1883f368711a6ca6746455d2a4076.zip
no_comment
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile2
-rwxr-xr-xtools/make_mdkinst_stage214
2 files changed, 9 insertions, 7 deletions
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