Module Name: src
Committed By: snj
Date: Fri Apr 3 17:52:49 UTC 2009
Modified Files:
src/usr.sbin/postinstall [netbsd-5]: postinstall
Log Message:
Pull up following revision(s) (requested by dyoung in ticket #649):
usr.sbin/postinstall/postinstall: revision 1.86
Look for MAKEDEV.local in both ${SRC_DIR}/dev/ and ${SRC_DIR}/etc/,
so that 'postinstall check makedev' works whether the sources told
by the -s argument are a NetBSD source tree, etc.tgz, or a DESTDIR.
To generate a diff of this commit:
cvs rdiff -u -r1.76.2.14 -r1.76.2.15 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.76.2.14 src/usr.sbin/postinstall/postinstall:1.76.2.15
--- src/usr.sbin/postinstall/postinstall:1.76.2.14 Fri Apr 3 17:51:54 2009
+++ src/usr.sbin/postinstall/postinstall Fri Apr 3 17:52:48 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.76.2.14 2009/04/03 17:51:54 snj Exp $
+# $NetBSD: postinstall,v 1.76.2.15 2009/04/03 17:52:48 snj Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -804,7 +804,11 @@
|| return 1
# ${dir} is set by find_file_in_dirlist()
compare_dir "$1" "${dir}" "${DEST_DIR}/dev" 555 MAKEDEV
- compare_dir "$1" "${SRC_DIR}/dev" "${DEST_DIR}/dev" 555 MAKEDEV.local
+ find_file_in_dirlist MAKEDEV.local "MAKEDEV.local" \
+ "${SRC_DIR}/etc" "${SRC_DIR}/dev" \
+ || return 1
+ # ${dir} is set by find_file_in_dirlist()
+ compare_dir "$1" "${dir}" "${DEST_DIR}/dev" 555 MAKEDEV.local
}
#
