[src/netbsd-3]: src/distrib/sparc Pull up following revision(s) (requested by...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0fc602385eba
branches:  netbsd-3
changeset: 577824:0fc602385eba
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Feb 14 13:19:29 2006 +0000

description:
Pull up following revision(s) (requested by chs in ticket #1163):
        distrib/sparc/miniroot/list: revision 1.29
        distrib/sparc/install.md: revision 1.20
change the old pre-sysinst install.md script to not need file(1)
and take that program and its associated "magic" database
out of the miniroot image.  fixes PR 32379.

diffstat:

 distrib/sparc/install.md    |  5 ++---
 distrib/sparc/miniroot/list |  6 +-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r 5a8c87dc87bf -r 0fc602385eba distrib/sparc/install.md
--- a/distrib/sparc/install.md  Sun Feb 12 22:50:48 2006 +0000
+++ b/distrib/sparc/install.md  Tue Feb 14 13:19:29 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: install.md,v 1.19 2004/01/17 05:30:01 lukem Exp $
+#      $NetBSD: install.md,v 1.19.6.1 2006/02/14 13:19:29 tron Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -275,8 +275,7 @@
        test -h $1 && return 1
        test -f $1 || return 1
 
-       r=`file $1 | sed -n -e '/ELF/p'`
-       test -z "$r" || return 1
+       [ "`dd if=$1 bs=1 skip=1 count=3 2> /dev/null`" = "ELF" ] && return 1
        return 0
 }
 
diff -r 5a8c87dc87bf -r 0fc602385eba distrib/sparc/miniroot/list
--- a/distrib/sparc/miniroot/list       Sun Feb 12 22:50:48 2006 +0000
+++ b/distrib/sparc/miniroot/list       Tue Feb 14 13:19:29 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.28 2003/12/28 13:00:47 martin Exp $
+#      $NetBSD: list,v 1.28.6.1 2006/02/14 13:19:29 tron Exp $
 
 # Sparc extra's
 PROG   bin/rcmd
@@ -14,7 +14,6 @@
 PROG   usr/bin/tset usr/bin/reset
 PROG   usr/bin/vi
 PROG   usr/bin/less usr/bin/more
-PROG   usr/bin/file
 PROG   usr/sbin/installboot
 
 # crunchgen source directory specials
@@ -35,9 +34,6 @@
 # and the termcap file
 COPY   ${ARCHDIR}/termcap.src          usr/share/misc/termcap
 
-# and the magic file
-COPY   ${DESTDIR}/usr/share/misc/magic usr/share/misc/magic
-
 # copy the kernel
 COPY   ${KERNOBJDIR}/GENERIC/netbsd    netbsd