From 601ece32c8ad750e2552f02a1c3cefe9e93b7940 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Mon, 15 Feb 2010 04:49:04 -0600
Subject: [PATCH] script/gentree: move overlay application before package
 installation

---
 script/gentree | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/script/gentree b/script/gentree
index 6e8ba7f..f596473 100755
--- a/script/gentree
+++ b/script/gentree
@@ -7,7 +7,7 @@ _root="$(dirname "${0}")"
 # Load needed modules
 want root ansi log ask
 
-targets="prepwork admin packages patch overlay prepboot preptmp prepetc prepvar imgboot imgconf imgetc imgvar custom"
+targets="prepwork admin overlay packages patch prepboot preptmp prepetc prepvar imgboot imgconf imgetc imgvar custom"
 
 pebkac() {
   [ "${*}" ] && printf "${*}\n\n"
@@ -103,6 +103,12 @@ do_admin() {
   echo '$1$2rXOWsK/$eiBHA6K7xL96DZbcY24YR0' | chk chroot "${sroot}" /usr/sbin/pw useradd admin -u 999 -g wheel -G operator -c Administrator -d /usr/home/admin -m -s /bin/csh -H 0
 }
 
+do_overlay() {
+  log Apply overlay from "${overlay##${base}/}"
+  [ -d "${overlay}" ] || return
+  ( cd "${overlay}" && find . | cpio -p "${sroot}" ) || chk
+}
+
 do_packages() {
   if [ -d "${pkgs}" -a "$(ls -1 "${pkgs}" | wc -l)" -gt 0 ]
   then
@@ -129,12 +135,6 @@ do_patch() {
   done
 }
 
-do_overlay() {
-  log Apply overlay from "${overlay##${base}/}"
-  [ -d "${overlay}" ] || return
-  ( cd "${overlay}" && find . | cpio -p "${sroot}" ) || chk
-}
-
 do_prepboot() {
   log Prepare /boot
   chk mv "${sroot}/boot/boot" "${sroot}/boot/boot.blk"
-- 
2.42.0