summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2004-11-16 00:35:05 -0500
committerAli Saidi <saidi@eecs.umich.edu>2004-11-16 00:35:05 -0500
commit0f82fb9d3b04275c0f0f728c7b56ba12d9e41123 (patch)
tree231a82508d72259f2e5516d7136c615fc92b51e7
parent8f362c7621de77836ddfc36d7d84732d10398c00 (diff)
parent82235799d35461b13f6841f16aa590e27bcaef42 (diff)
downloadgem5-0f82fb9d3b04275c0f0f728c7b56ba12d9e41123.tar.xz
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG-- extra : convert_revision : ef573e6e6dab2516c930b6209b66442d8ad85be0
-rwxr-xr-xconfigs/boot/nfs-client.rcS4
-rwxr-xr-xconfigs/boot/nfs-server.rcS14
2 files changed, 9 insertions, 9 deletions
diff --git a/configs/boot/nfs-client.rcS b/configs/boot/nfs-client.rcS
index e843069ef..005743bfb 100755
--- a/configs/boot/nfs-client.rcS
+++ b/configs/boot/nfs-client.rcS
@@ -4,7 +4,7 @@
#
echo -n "mounting swap..."
-/sbin/swapon /dev/hdc1
+/sbin/swapon /dev/hdc
echo "done."
echo -n "setting up network..."
@@ -45,6 +45,6 @@ mkdir /nfs
mount 10.0.0.1:/nfs /nfs
echo "done."
-/bin/bonnie++ -u 99 -s 100 -r 0 -n 0 -d /nfs
+/bin/bonnie++ -u 99 -s 700 -r 0 -n 0 -d /nfs
/sbin/m5 exit
diff --git a/configs/boot/nfs-server.rcS b/configs/boot/nfs-server.rcS
index f09b547bd..21b7ab83c 100755
--- a/configs/boot/nfs-server.rcS
+++ b/configs/boot/nfs-server.rcS
@@ -4,7 +4,7 @@
#
echo -n "mounting swap..."
-/sbin/swapon /dev/hdc1
+/sbin/swapon /dev/hdc
echo "done."
echo -n "setting up network..."
@@ -38,16 +38,16 @@ echo "done."
# mknod /dev/sda1 b 8 1
#fi
-/sbin/insmod /modules/scsi_debug.ko dev_size_mb=128
+/sbin/insmod /modules/scsi_debug.ko dev_size_mb=768
echo -n "creating partition and formatting..."
-echo "1,120,L" > /tmp/sfdisk.run
-/usr/sbin/sfdisk -uM --force /dev/sda < /tmp/sfdisk.run
-/sbin/mke2fs /dev/sda1
+#echo "1,767,L" > /tmp/sfdisk.run
+#/usr/sbin/sfdisk -uM --force /dev/sda < /tmp/sfdisk.run
+/sbin/mke2fs -F /dev/sda
mkdir /nfs
-/bin/mount /dev/sda1 /nfs
+/bin/mount /dev/sda /nfs
chmod a+rwx /nfs
-/usr/sbin/sfdisk -uM -l /dev/sda
+#/usr/sbin/sfdisk -uM -l /dev/sda
echo "done."
echo "/nfs 10.0.0.0/255.0.0.0(rw,sync,no_root_squash)" > /etc/exports