Module Name: src
Committed By: snj
Date: Thu May 14 00:26:09 UTC 2009
Modified Files:
src/usr.sbin/postinstall [netbsd-5-0]: postinstall
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #756):
usr.sbin/postinstall/postinstall: revision 1.97
fetch /etc/dhcpcd.conf from the correct place when building the system
To generate a diff of this commit:
cvs rdiff -u -r1.76.2.16.2.1 -r1.76.2.16.2.2 \
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.16.2.1 src/usr.sbin/postinstall/postinstall:1.76.2.16.2.2
--- src/usr.sbin/postinstall/postinstall:1.76.2.16.2.1 Wed May 13 00:39:27 2009
+++ src/usr.sbin/postinstall/postinstall Thu May 14 00:26:09 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.76.2.16.2.1 2009/05/13 00:39:27 snj Exp $
+# $NetBSD: postinstall,v 1.76.2.16.2.2 2009/05/14 00:26:09 snj Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -723,8 +723,10 @@
op="$1"
failed=0
- populate_dir "$op" true "${SRC_DIR}/etc" "${DEST_DIR}/etc" 644 \
- dhcpcd.conf
+ find_file_in_dirlist dhcpcd.conf "dhcpcd.conf" \
+ "${SRC_DIR}/external/bsd/dhcpcd/dist" "${SRC_DIR}/etc" || return 1
+ # ${dir} is set by find_file_in_dirlist()
+ populate_dir "$op" true "${dir}" "${DEST_DIR}/etc" 644 dhcpcd.conf
failed=$(( ${failed} + $? ))
return ${failed}
