populateusrlocal() is used only once in finish_up(). Just fold it in there.

OK krw@ halex@

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 46a6d1e..76034cd 100644 (file)
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#      $OpenBSD: install.sub,v 1.760 2014/04/19 16:50:52 rpe Exp $
+#      $OpenBSD: install.sub,v 1.761 2014/04/19 18:31:24 rpe Exp $
 #
 # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
 # All rights reserved.
@@ -1808,12 +1808,6 @@ donetconfig() {
        fi
 }
 
-populateusrlocal() {
-       if [ -f /mnt/etc/mtree/BSD.local.dist ]; then
-               /mnt/usr/sbin/chroot /mnt /usr/sbin/mtree -Uedqn -p /usr/local -f /etc/mtree/BSD.local.dist >/dev/null
-       fi
-}
-
 apply()
 {
        if [[ $sshd == n ]]; then
@@ -1968,7 +1962,10 @@ finish_up() {
        # dynamic.  That is highly discouraged, but let us play it safe.
        rm -f /mnt/var/run/ld.so.hints
 
-       populateusrlocal
+       if [ -f /mnt/etc/mtree/BSD.local.dist ]; then
+               /mnt/usr/sbin/chroot /mnt /usr/sbin/mtree -Uedqn -p /usr/local \
+                       -f /etc/mtree/BSD.local.dist >/dev/null
+       fi
 
        [ -x /mnt/$MODE.site ] && /mnt/usr/sbin/chroot /mnt /$MODE.site