summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorPer Fogelstrom <pefo@cvs.openbsd.org>1997-10-15 14:09:06 +0000
committerPer Fogelstrom <pefo@cvs.openbsd.org>1997-10-15 14:09:06 +0000
commit1295c29fdc5d787db77fe41900e8a131f89b44f2 (patch)
treea9e159eecaacc9fc0134bb832e3352265b43874c /distrib
parentdf1fc979e9dafa311ec8c2b86389e9f06b05da68 (diff)
Fix some inconsitencies
Diffstat (limited to 'distrib')
-rw-r--r--distrib/powerpc/ramdisk/Makefile8
-rw-r--r--distrib/powerpc/ramdisk/install.md10
-rw-r--r--distrib/powerpc/ramdisk/list9
3 files changed, 14 insertions, 13 deletions
diff --git a/distrib/powerpc/ramdisk/Makefile b/distrib/powerpc/ramdisk/Makefile
index 68d9bc38c8e..1b30d9b5f3d 100644
--- a/distrib/powerpc/ramdisk/Makefile
+++ b/distrib/powerpc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 1997/10/10 10:16:54 pefo Exp $
+# $OpenBSD: Makefile,v 1.2 1997/10/15 14:09:04 pefo Exp $
TOP= ${.CURDIR}/..
@@ -43,10 +43,10 @@ ${IMAGE}: rd_setup do_files rd_teardown
.endif
bsd:
- cd ${.TOP}/../../sys/arch/power4e/conf && config RAMDISK
- cd ${.TOP}/../../sys/arch/power4e/compile/RAMDISK && \
+ cd ${.TOP}/../../sys/arch/powerpc/conf && config RAMDISK
+ cd ${.TOP}/../../sys/arch/powerpc/compile/RAMDISK && \
make clean && make
- cp ${.TOP}/../../sys/arch/power4e/compile/RAMDISK/bsd bsd
+ cp ${.TOP}/../../sys/arch/powerpc/compile/RAMDISK/bsd bsd
rd_setup:
dd if=/dev/zero of=${REALIMAGE} bs=512 count=${NBLKS}
diff --git a/distrib/powerpc/ramdisk/install.md b/distrib/powerpc/ramdisk/install.md
index 88a82090821..48aefefd321 100644
--- a/distrib/powerpc/ramdisk/install.md
+++ b/distrib/powerpc/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.1 1997/10/10 10:16:56 pefo Exp $
+# $OpenBSD: install.md,v 1.2 1997/10/15 14:09:04 pefo Exp $
#
#
# Copyright rc) 1996 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@ md_get_partition_range() {
md_installboot() {
echo "Installing boot in the msdos partition /dev/${1}i"
if mount -t msdos /dev/${1}i /mnt2 ; then
-# do the copy.....
+ cp /usr/mdec/ofwboot /mnt2
umount /mnt2
else
echo "Failed, you will not be able to boot from /dev/${1}."
@@ -103,11 +103,11 @@ md_init_mbr() {
echo
echo "You will now be asked if you want to initialize the disk with a 5Mb"
echo "MSDOS partition. This is the recomended setup and will allow you to"
- echo "store about three to four different bootable kernels on the disk."
+ echo "store the boot and other interesting things here."
echo "If you want to have a different setup, exit 'install' now and do"
echo "the MBR initialization by hand using the 'fdisk' program. You may"
echo "also use any vendor specific program to set up the disk. Consult"
- echo "your ARC system manuals for doing setup this way."
+ echo "your PowerPC system manuals for doing setup this way."
echo
echo -n "Do you want to init the MBR and the MSDOS partition? [y]"
getresp "y"
@@ -142,7 +142,7 @@ md_checkfordisklabel() {
echo "Install will put a boot program with the name 'ofwboot' in there"
echo "that you later should use to boot OpenBSD."
echo
- echo -n "Have initialized a MSDOS partition with OpenFirmware? [n]"
+ echo -n "Have you initialized a MSDOS partition with OpenFirmware? [n]"
getresp "n"
case "$resp" in
n*|N*)
diff --git a/distrib/powerpc/ramdisk/list b/distrib/powerpc/ramdisk/list
index 5981955ed78..fd2dafe7026 100644
--- a/distrib/powerpc/ramdisk/list
+++ b/distrib/powerpc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.1 1997/10/10 10:16:56 pefo Exp $
+# $OpenBSD: list,v 1.2 1997/10/15 14:09:05 pefo Exp $
SRCDIRS distrib/special
SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin
@@ -71,9 +71,10 @@ COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
SPECIAL /bin/rm dev/MAKEDEV
-# we need the contents of /usr/mdec XXX needs to be fixed......
-#COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
-#COPY ${DESTDIR}/usr/mdec/msdos5mb.gz usr/mdec/msdos5mb.gz
+# we need the contents of /usr/mdec
+COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot
+COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
+COPY ${DESTDIR}/usr/mdec/msdos5mb.gz usr/mdec/msdos5mb.gz
# various files that we need in /etc for the install
COPY ${DESTDIR}/etc/group etc/group