Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Fix yet another "openpty() failed" error during sysinst.



details:   https://anonhg.NetBSD.org/src/rev/2856ff68f6c8
branches:  trunk
changeset: 786418:2856ff68f6c8
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Apr 28 08:08:03 2013 +0000

description:
Fix yet another "openpty() failed" error during sysinst.

Prepare a new entry for ramdisk that includes ipty target in
etc.hp300/MAKEDEV.conf and use it in distrib/hp300/ramdisk/Makefile.
See also PR/46812, PR/47123, and PR/47774.

We could simply add "ipty" to MAKEDEVTARGETS as miniroot/Makefile does,
but it's better to shrink ramdisk size as much as possible.

Should be pulled up to both netbsd-6 and netbsd-6-0.

diffstat:

 distrib/hp300/ramdisk/Makefile |   4 ++--
 etc/etc.hp300/MAKEDEV.conf     |  15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r 90ac5132c194 -r 2856ff68f6c8 distrib/hp300/ramdisk/Makefile
--- a/distrib/hp300/ramdisk/Makefile    Sun Apr 28 06:14:52 2013 +0000
+++ b/distrib/hp300/ramdisk/Makefile    Sun Apr 28 08:08:03 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.31 2013/03/23 18:15:07 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.32 2013/04/28 08:08:03 tsutsui Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -14,7 +14,7 @@
 LISTS=         ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst.en
 MTREECONF=     ${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=   be
-MAKEDEVTARGETS=        all
+MAKEDEVTARGETS=        ramdisk
 IMAGEDEPENDS=  ${CRUNCHBIN} \
                dot.profile \
                ${DESTDIR}/usr/mdec/installboot ${DESTDIR}/usr/mdec/uboot.lif \
diff -r 90ac5132c194 -r 2856ff68f6c8 etc/etc.hp300/MAKEDEV.conf
--- a/etc/etc.hp300/MAKEDEV.conf        Sun Apr 28 06:14:52 2013 +0000
+++ b/etc/etc.hp300/MAKEDEV.conf        Sun Apr 28 08:08:03 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MAKEDEV.conf,v 1.13 2011/09/06 14:40:11 apb Exp $
+#      $NetBSD: MAKEDEV.conf,v 1.14 2013/04/28 08:08:04 tsutsui Exp $
 
 all_md)
        makedev ct0 ct1 rd0 rd1 rd2
@@ -12,6 +12,19 @@
        makedev ss0 uk0 uk1
        ;;
 
+ramdisk)
+       makedev std
+       makedev md0
+       makedev ct0 ct1 rd0 rd1 rd2
+       makedev sd0 sd1 sd2 cd0 cd1 st0 st1 ch0
+       makedev scsibus0
+       makedev ipty
+       makedev ttyEcfg ttyE0 wskbd0
+       makedev ttyC0 ttyC1 ttyC2 ttyC3
+       makedev ttyM0 ttyM1 ttyM2 ttyM3
+       makedev bpf
+       ;;
+
 ct[0-9]*)
        name=ct; unit=${i#ct}; blk=0; chr=7
        case $unit in



Home | Main Index | Thread Index | Old Index