Thu May 14 00:26:09 2009 UTC ()
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


(snj)
diff -r1.76.2.16.2.1 -r1.76.2.16.2.2 src/usr.sbin/postinstall/postinstall

cvs diff -r1.76.2.16.2.1 -r1.76.2.16.2.2 src/usr.sbin/postinstall/Attic/postinstall (expand / switch to unified diff)

--- src/usr.sbin/postinstall/Attic/postinstall 2009/05/13 00:39:27 1.76.2.16.2.1
+++ src/usr.sbin/postinstall/Attic/postinstall 2009/05/14 00:26:09 1.76.2.16.2.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $NetBSD: postinstall,v 1.76.2.16.2.1 2009/05/13 00:39:27 snj Exp $ 3# $NetBSD: postinstall,v 1.76.2.16.2.2 2009/05/14 00:26:09 snj Exp $
4# 4#
5# Copyright (c) 2002-2008 The NetBSD Foundation, Inc. 5# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
6# All rights reserved. 6# All rights reserved.
7# 7#
8# This code is derived from software contributed to The NetBSD Foundation 8# This code is derived from software contributed to The NetBSD Foundation
9# by Luke Mewburn. 9# by Luke Mewburn.
10# 10#
11# Redistribution and use in source and binary forms, with or without 11# Redistribution and use in source and binary forms, with or without
12# modification, are permitted provided that the following conditions 12# modification, are permitted provided that the following conditions
13# are met: 13# are met:
14# 1. Redistributions of source code must retain the above copyright 14# 1. Redistributions of source code must retain the above copyright
15# notice, this list of conditions and the following disclaimer. 15# notice, this list of conditions and the following disclaimer.
16# 2. Redistributions in binary form must reproduce the above copyright 16# 2. Redistributions in binary form must reproduce the above copyright
@@ -713,28 +713,30 @@ do_defaults() @@ -713,28 +713,30 @@ do_defaults()
713 return ${failed} 713 return ${failed}
714} 714}
715 715
716# 716#
717# dhcpcd 717# dhcpcd
718# 718#
719additem dhcpcd "dhcpcd configuration is up to date" 719additem dhcpcd "dhcpcd configuration is up to date"
720do_dhcpcd() 720do_dhcpcd()
721{ 721{
722 [ -n "$1" ] || err 3 "USAGE: do_dhcpcd fix|check" 722 [ -n "$1" ] || err 3 "USAGE: do_dhcpcd fix|check"
723 op="$1" 723 op="$1"
724 failed=0 724 failed=0
725 725
726 populate_dir "$op" true "${SRC_DIR}/etc" "${DEST_DIR}/etc" 644 \ 726 find_file_in_dirlist dhcpcd.conf "dhcpcd.conf" \
727 dhcpcd.conf 727 "${SRC_DIR}/external/bsd/dhcpcd/dist" "${SRC_DIR}/etc" || return 1
 728 # ${dir} is set by find_file_in_dirlist()
 729 populate_dir "$op" true "${dir}" "${DEST_DIR}/etc" 644 dhcpcd.conf
728 failed=$(( ${failed} + $? )) 730 failed=$(( ${failed} + $? ))
729 731
730 return ${failed} 732 return ${failed}
731} 733}
732 734
733# 735#
734# envsys 736# envsys
735# 737#
736additem envsys "envsys configuration is up to date" 738additem envsys "envsys configuration is up to date"
737do_envsys() 739do_envsys()
738{ 740{
739 [ -n "$1" ] || err 3 "USAGE: do_envsys fix|check" 741 [ -n "$1" ] || err 3 "USAGE: do_envsys fix|check"
740 op="$1" 742 op="$1"