Module Name: src
Committed By: sborrill
Date: Thu Oct 8 10:00:10 UTC 2009
Modified Files:
src/usr.sbin/postinstall [netbsd-5]: postinstall
Log Message:
Pull up the following revisions(s) (requested by taca in ticket #1077):
usr.sbin/postinstall/postinstall: revision 1.98
Make the makedev step fail if either MAKEDEV or MAKEDEV.local need to
be updated.
To generate a diff of this commit:
cvs rdiff -u -r1.76.2.21 -r1.76.2.22 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.21 src/usr.sbin/postinstall/postinstall:1.76.2.22
--- src/usr.sbin/postinstall/postinstall:1.76.2.21 Thu Sep 17 04:24:43 2009
+++ src/usr.sbin/postinstall/postinstall Thu Oct 8 10:00:10 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.76.2.21 2009/09/17 04:24:43 snj Exp $
+# $NetBSD: postinstall,v 1.76.2.22 2009/10/08 10:00:10 sborrill Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -845,6 +845,7 @@
do_makedev()
{
[ -n "$1" ] || err 3 "USAGE: do_makedev fix|check"
+ failed=0
if [ -f "${SRC_DIR}/etc/MAKEDEV.tmpl" ]; then
# generate MAKEDEV from source if source is available
@@ -860,11 +861,16 @@
|| return 1
# ${dir} is set by find_file_in_dirlist()
compare_dir "$1" "${dir}" "${DEST_DIR}/dev" 555 MAKEDEV
+ failed=$(( ${failed} + $? ))
+
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
+ failed=$(( ${failed} + $? ))
+
+ return ${failed}
}
#
