Module Name: src
Committed By: roy
Date: Sat Apr 1 19:14:10 UTC 2017
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Pluck dhcpcd.conf from dist/src
Move dhcpcd.duid and dhcpcd.secret from /etc to /var/db/dhcpcd/{duid,secret}
To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 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.210 src/usr.sbin/postinstall/postinstall:1.211
--- src/usr.sbin/postinstall/postinstall:1.210 Sat Feb 11 19:35:45 2017
+++ src/usr.sbin/postinstall/postinstall Sat Apr 1 19:14:10 2017
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.210 2017/02/11 19:35:45 uwe Exp $
+# $NetBSD: postinstall,v 1.211 2017/04/01 19:14:10 roy Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -885,11 +885,25 @@ do_dhcpcd()
failed=0
find_file_in_dirlist dhcpcd.conf "dhcpcd.conf" \
- "${SRC_DIR}/external/bsd/dhcpcd/dist" "${SRC_DIR}/etc" || return 1
+ "${SRC_DIR}/external/bsd/dhcpcd/dist/src" \
+ "${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} + $? ))
+ check_dir "${op}" "${DEST_DIR}/var/db/dhcpcd" 755
+ failed=$(( ${failed} + $? ))
+
+ move_file "${op}" \
+ "${DEST_DIR}/etc/dhcpcd.duid" \
+ "${DEST_DIR}/var/db/dhcpcd/duid"
+ failed=$(( ${failed} + $? ))
+
+ move_file "${op}" \
+ "${DEST_DIR}/etc/dhcpcd.secret" \
+ "${DEST_DIR}/var/db/dhcpcd/secret"
+ failed=$(( ${failed} + $? ))
+
return ${failed}
}
