Fri Jun 19 21:39:00 2009 UTC ()
Pull up following revision(s) (requested by tsutsui in ticket #820):
	distrib/hp300/miniroot/install.md: revision 1.14
Make install.md script probe cd(4) devices properly.
Problem reported by doomwarrior on port-hp300.


(snj)
diff -r1.13 -r1.13.4.1 src/distrib/hp300/miniroot/install.md

cvs diff -r1.13 -r1.13.4.1 src/distrib/hp300/miniroot/install.md (expand / switch to unified diff)

--- src/distrib/hp300/miniroot/install.md 2008/04/30 13:10:48 1.13
+++ src/distrib/hp300/miniroot/install.md 2009/06/19 21:39:00 1.13.4.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $NetBSD: install.md,v 1.13 2008/04/30 13:10:48 martin Exp $ 3# $NetBSD: install.md,v 1.13.4.1 2009/06/19 21:39:00 snj Exp $
4# 4#
5# Copyright (c) 1996 The NetBSD Foundation, Inc. 5# Copyright (c) 1996 The NetBSD Foundation, Inc.
6# All rights reserved. 6# All rights reserved.
7# 7#
8# This code is derived from software contributed to The NetBSD Foundation 8# This code is derived from software contributed to The NetBSD Foundation
9# by Jason R. Thorpe. 9# by Jason R. Thorpe.
10# 10#
11# Redistribution and use in source and binary forms, with or without 11# Redistribution and use in source and binary forms, with or without
12# modification, are permitted provided that the following conditions 12# modification, are permitted provided that the following conditions
13# are met: 13# are met:
14# 1. Redistributions of source code must retain the above copyright 14# 1. Redistributions of source code must retain the above copyright
15# notice, this list of conditions and the following disclaimer. 15# notice, this list of conditions and the following disclaimer.
16# 2. Redistributions in binary form must reproduce the above copyright 16# 2. Redistributions in binary form must reproduce the above copyright
@@ -65,27 +65,27 @@ __mfs_failed_1 @@ -65,27 +65,27 @@ __mfs_failed_1
65 65
66 # Bleh. Give mount_mfs a chance to DTRT. 66 # Bleh. Give mount_mfs a chance to DTRT.
67 sleep 2 67 sleep 2
68} 68}
69 69
70md_get_diskdevs() { 70md_get_diskdevs() {
71 # return available disk devices 71 # return available disk devices
72 dmesg | awk -F : '/^rd[0-9]*:./ { print $1; }' | sort -u 72 dmesg | awk -F : '/^rd[0-9]*:./ { print $1; }' | sort -u
73 dmesg | awk -F : '/^sd[0-9]*:.*sectors/ { print $1; }' | sort -u 73 dmesg | awk -F : '/^sd[0-9]*:.*sectors/ { print $1; }' | sort -u
74} 74}
75 75
76md_get_cddevs() { 76md_get_cddevs() {
77 # return available CD-ROM devices 77 # return available CD-ROM devices
78 dmesg | awk -F : '/^cd[0-9]*:.*cdrom/ { print $1; }' | sort -u 78 dmesg | awk -F : '/^cd[0-9]*:/ { print $1; }' | sort -u
79} 79}
80 80
81md_get_ifdevs() { 81md_get_ifdevs() {
82 # return available network interfaces 82 # return available network interfaces
83 dmesg | awk -F : '/^le[0-9]*:/ { print $1; }' | sort -u 83 dmesg | awk -F : '/^le[0-9]*:/ { print $1; }' | sort -u
84} 84}
85 85
86md_installboot() { 86md_installboot() {
87 # $1 is the root disk 87 # $1 is the root disk
88 88
89 echo -n "Installing boot block..." 89 echo -n "Installing boot block..."
90 /usr/sbin/installboot -v /dev/r${1}c /usr/mdec/uboot.lif 90 /usr/sbin/installboot -v /dev/r${1}c /usr/mdec/uboot.lif
91 echo "done." 91 echo "done."