From: Cristiano Giuffrida <giuffrida@cs.vu.nl>
Date: Wed, 16 Jul 2014 12:41:11 +0000 (+0200)
Subject: llvm: Use mfs images for clientctl buildisk.
X-Git-Tag: v3.3.0~135
X-Git-Url: http://zhaoyanbai.com/repos/man.rndc.conf.html?a=commitdiff_plain;h=592c9e1223dd93569f0c3f3f1c8419a4c69ce531;p=minix.git

llvm: Use mfs images for clientctl buildisk.
---

diff --git a/minix/llvm/clientctl b/minix/llvm/clientctl
index 20e4b2c59..e47552799 100755
--- a/minix/llvm/clientctl
+++ b/minix/llvm/clientctl
@@ -10,6 +10,7 @@ MYPWD=$( pwd )
 IMAGE=$( readlink -f $ROOT/minix_x86.img )
 DISK=$( readlink -f $ROOT/minix_x86.disk )
 RC=$( readlink -f $ROOT/minix_x86.rc )
+MKFS=$( readlink -f $ROOT/../obj.i386/tooldir*/bin/nbmkfs.mfs )
 
 HYPER=${HYPER:-}
 DISK_SIZE=${DISK_SIZE:-1024}
@@ -23,7 +24,7 @@ function rc_create {
 set -o errexit
 
 [ -d /ext ] || mkdir /ext
-mount -t ext2 /dev/c0d1 /ext
+mount /dev/c0d1 /ext
 
 if [ -f /ext/etc/rc ]; then
     sh /ext/etc/rc
@@ -59,7 +60,7 @@ function disk_build {
     local tmp_mnt=$( mktemp -d /tmp/clientctl-XXXXX )
     echo "* Building ${size} MB disk image..."
     dd if=/dev/zero of=$DISK bs=1M count=$size
-    mkfs -t ext2 -i 4096 -b 4096 -F $DISK
+    $MKFS $DISK
     echo "* Setting up /ext/etc/rc file executed at startup..."
     rc_create > $RC
     disk_mount $tmp_mnt