Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/sparc change the old pre-sysinst install.md script t...
details: https://anonhg.NetBSD.org/src/rev/576aed269f4a
branches: trunk
changeset: 588081:576aed269f4a
user: chs <chs%NetBSD.org@localhost>
date: Tue Feb 07 16:52:16 2006 +0000
description:
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 929a570a1a7d -r 576aed269f4a distrib/sparc/install.md
--- a/distrib/sparc/install.md Tue Feb 07 11:59:22 2006 +0000
+++ b/distrib/sparc/install.md Tue Feb 07 16:52:16 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.20 2006/02/07 16:52:16 chs 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 929a570a1a7d -r 576aed269f4a distrib/sparc/miniroot/list
--- a/distrib/sparc/miniroot/list Tue Feb 07 11:59:22 2006 +0000
+++ b/distrib/sparc/miniroot/list Tue Feb 07 16:52:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.28 2003/12/28 13:00:47 martin Exp $
+# $NetBSD: list,v 1.29 2006/02/07 16:52:16 chs 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
Home |
Main Index |
Thread Index |
Old Index