summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2004-11-17 22:05:34 -0500
committerAli Saidi <saidi@eecs.umich.edu>2004-11-17 22:05:34 -0500
commit1b374f40088ad3fd6160c6e0289a3059c962b2e1 (patch)
tree5108d07ebea93a71d9c01d7742b21554fbe95610
parent873fb248dc4608f21e1ececa1c5abf4a495e7448 (diff)
parent72aea04d8dbab87c3c34d987f755417fdc356231 (diff)
downloadgem5-1b374f40088ad3fd6160c6e0289a3059c962b2e1.tar.xz
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG-- extra : convert_revision : 950a2d6e131378be0af4ba76664a42235579bc75
-rw-r--r--configs/boot/nat-spec-surge-client.rcS2
-rwxr-xr-xconfigs/boot/nat-spec-surge-server.rcS2
-rw-r--r--configs/boot/spec-surge-client.rcS2
-rwxr-xr-xconfigs/boot/spec-surge-server.rcS2
-rwxr-xr-xconfigs/boot/surge-client.rcS2
-rwxr-xr-xconfigs/boot/surge-server.rcS2
6 files changed, 6 insertions, 6 deletions
diff --git a/configs/boot/nat-spec-surge-client.rcS b/configs/boot/nat-spec-surge-client.rcS
index 39e3e5070..2c0b46607 100644
--- a/configs/boot/nat-spec-surge-client.rcS
+++ b/configs/boot/nat-spec-surge-client.rcS
@@ -6,7 +6,7 @@ CLIENT=10.0.0.2
SERVER=192.168.0.1
echo -n "mounting swap..."
-/sbin/swapon /dev/hdc1
+/sbin/swapon /dev/hdc
echo "done."
echo -n "setting up network..."
diff --git a/configs/boot/nat-spec-surge-server.rcS b/configs/boot/nat-spec-surge-server.rcS
index 39eb5bee0..ed0e96a44 100755
--- a/configs/boot/nat-spec-surge-server.rcS
+++ b/configs/boot/nat-spec-surge-server.rcS
@@ -5,7 +5,7 @@
NATBOX=192.168.0.7
echo -n "mounting swap..."
-/sbin/swapon /dev/hdc1
+/sbin/swapon /dev/hdc
echo "done."
echo -n "setting up network..."
diff --git a/configs/boot/spec-surge-client.rcS b/configs/boot/spec-surge-client.rcS
index b7a2a12e4..6ce2ce9de 100644
--- a/configs/boot/spec-surge-client.rcS
+++ b/configs/boot/spec-surge-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..."
diff --git a/configs/boot/spec-surge-server.rcS b/configs/boot/spec-surge-server.rcS
index 61afd78bf..12e31696b 100755
--- a/configs/boot/spec-surge-server.rcS
+++ b/configs/boot/spec-surge-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..."
diff --git a/configs/boot/surge-client.rcS b/configs/boot/surge-client.rcS
index f41c13882..208524a9c 100755
--- a/configs/boot/surge-client.rcS
+++ b/configs/boot/surge-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..."
diff --git a/configs/boot/surge-server.rcS b/configs/boot/surge-server.rcS
index 75642c259..3feb7b581 100755
--- a/configs/boot/surge-server.rcS
+++ b/configs/boot/surge-server.rcS
@@ -5,7 +5,7 @@
echo -n "mounting swap..."
-/sbin/swapon /dev/hdc1
+/sbin/swapon /dev/hdc
echo "done."
echo -n "setting up network..."