From 913b16f3260fd89072e0097c7ba59acefbf8a1dd Mon Sep 17 00:00:00 2001 From: rahnds <> Date: Thu, 3 Feb 2000 03:06:55 +0000 Subject: [PATCH] Use the correct terminal entry for Openfirmware console. Allows visual editors to be used. --- src/etc/etc.powerpc/MAKEDEV | 8 ++++++-- src/etc/etc.powerpc/Makefile.inc | 25 ++++--------------------- src/etc/etc.powerpc/ttys | 4 ++-- 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/src/etc/etc.powerpc/MAKEDEV b/src/etc/etc.powerpc/MAKEDEV index 64c61308..dacdd2e1 100644 --- a/src/etc/etc.powerpc/MAKEDEV +++ b/src/etc/etc.powerpc/MAKEDEV @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: MAKEDEV,v 1.27 1999/08/20 17:00:37 downsj Exp $ +# $OpenBSD: MAKEDEV,v 1.28 2000/02/03 03:06:54 rahnds Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -36,6 +36,7 @@ # # Disks: # fd* Floppy disk drives (3 1/2", 5 1/4") +# wd* IDE disks # sd* SCSI disks # cd* SCSI cdrom drives # ch* SCSI media changer @@ -131,6 +132,7 @@ case $i in all) sh $this std fd + sh $this wd0 wd1 wd2 wd3 sh $this sd0 sd1 sd2 sd3 st0 st1 cd0 cd1 sh $this ofdisk0 ofdisk1 ofdisk2 ofdisk3 ofdisk4 sh $this ofdisk5 ofdisk6 ofdisk7 ofdisk8 ofdisk9 @@ -149,6 +151,7 @@ all) ramdisk) sh $this std + sh $this wd0 wd1 wd2 wd3 sh $this sd0 sd1 sd2 sd3 sd4 st0 st1 cd0 cd1 sh $this ofdisk0 ofdisk1 ofdisk2 ofdisk3 ofdisk4 sh $this rd0 @@ -185,10 +188,11 @@ fd) chmod 666 fd/* ;; -sd*|ccd*|ofdisk*) +sd*|wd*|ccd*|ofdisk*) umask 2 ; unit=${i##*[a-z]} case $i in sd*) name=sd; blk=2; chr=8;; + wd*) name=wd; blk=0; chr=11;; ofdisk*) name=ofdisk; blk=4; chr=13;; ccd*) name=ccd; blk=16; chr=18;; esac diff --git a/src/etc/etc.powerpc/Makefile.inc b/src/etc/etc.powerpc/Makefile.inc index c25479a5..67468bb9 100644 --- a/src/etc/etc.powerpc/Makefile.inc +++ b/src/etc/etc.powerpc/Makefile.inc @@ -1,20 +1,15 @@ -# $OpenBSD: Makefile.inc,v 1.14 1998/10/20 23:22:17 rahnds Exp $ +# $OpenBSD: Makefile.inc,v 1.15 2000/02/03 03:06:55 rahnds Exp $ # etc.powerpc/Makefile.inc -- powerpc-specific etc Makefile targets .ifdef DESTDIR snap_md: bsd distrib bsd: - cd ${.CURDIR}/../sys/arch/powerpc/conf && config GENERIC - cd ${.CURDIR}/../sys/arch/powerpc/compile/GENERIC && \ + cd ${.CURDIR}/../sys/arch/powerpc/conf && config GENERICMAC + cd ${.CURDIR}/../sys/arch/powerpc/compile/GENERICMAC && \ make clean && make depend && make - cp ${.CURDIR}/../sys/arch/powerpc/compile/GENERIC/bsd \ + cp ${.CURDIR}/../sys/arch/powerpc/compile/GENERICMAC/bsd \ ${DESTDIR}/snapshot/bsd - cd ${.CURDIR}/../sys/arch/powerpc/conf && config DDBOFW - cd ${.CURDIR}/../sys/arch/powerpc/compile/DDBOFW && \ - make clean && make depend && make - (cd ${.CURDIR}/../sys/arch/powerpc/compile/DDBOFW/ && \ - tar czf ${DESTDIR}/snapshot/bsdofw${OSrev}.tar.gz bsd ) # knows about bsd.rd and bsdofw.rd distrib: @@ -30,22 +25,10 @@ distrib: mkisofs -r ${DESTDIR}/snapshot/boot > ${DESTDIR}/snapshot/boot.fs rm -rf ${DESTDIR}/snapshot/boot # - mkdir ${DESTDIR}/snapshot/bootofw - cp ${DESTDIR}/snapshot/bsdofw.rd ${DESTDIR}/snapshot/bootofw/bsdofw.rd - strip ${DESTDIR}/snapshot/bootofw/bsdofw.rd - gzip -9 ${DESTDIR}/snapshot/bootofw/bsdofw.rd - mv ${DESTDIR}/snapshot/bootofw/bsdofw.rd.gz ${DESTDIR}/snapshot/bootofw/bsd - cp ${DESTDIR}/usr/mdec/ofwboot ${DESTDIR}/snapshot/bootofw - cp ${DESTDIR}/usr/mdec/boot.mac ${DESTDIR}/snapshot/bootofw - mkisofs -r ${DESTDIR}/snapshot/bootofw > ${DESTDIR}/snapshot/bootofw.fs - rm -rf ${DESTDIR}/snapshot/bootofw - # # compress the bsd.rd files but keep original naming, # bootloader can deal with it. gzip -9 ${DESTDIR}/snapshot/bsd.rd mv ${DESTDIR}/snapshot/bsd.rd.gz ${DESTDIR}/snapshot/bsd.rd - gzip -9 ${DESTDIR}/snapshot/bsdofw.rd - mv ${DESTDIR}/snapshot/bsdofw.rd.gz ${DESTDIR}/snapshot/bsdofw.rd .endif # DESTDIR check diff --git a/src/etc/etc.powerpc/ttys b/src/etc/etc.powerpc/ttys index 1037c716..c0e3b156 100644 --- a/src/etc/etc.powerpc/ttys +++ b/src/etc/etc.powerpc/ttys @@ -1,5 +1,5 @@ # -# $OpenBSD: ttys,v 1.7 1998/09/27 04:26:54 rahnds Exp $ +# $OpenBSD: ttys,v 1.8 2000/02/03 03:06:55 rahnds Exp $ # # name getty type status comments # @@ -8,5 +8,5 @@ tty00 "/usr/libexec/getty std.9600" unknown on secure tty01 "/usr/libexec/getty std.9600" unknown off secure tty02 "/usr/libexec/getty std.9600" unknown off secure tty03 "/usr/libexec/getty std.9600" unknown on secure -ttyo0 "/usr/libexec/getty std.9600" unknown on secure +ttyo0 "/usr/libexec/getty std.9600" vt220 on secure ttyE0 "/usr/libexec/getty std.9600" unknown on secure