Changeset f14291b in mainline for contrib/conf/ia32-qe.sh

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• contrib/conf/ia32-qe.sh (modified) (1 diff)

contrib/conf/ia32-qe.sh

@@ -5 +5 @@
 # Create a disk image if it does not exist
 if [ ! -f "$DISK_IMG" ]; then
-        tools/mkfat.py uspace/dist/data "$DISK_IMG"
+        tools/mkfat.py 1048576 uspace/dist/data "$DISK_IMG"
 fi