From 8d8b2808669d9cefa13f65623a1537e288ecbb22 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Sat, 16 Jun 2012 22:04:15 -0500
Subject: [PATCH] script/gentree: use -l instead of --link in cpio -p
 invocations

---
 script/gentree | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/script/gentree b/script/gentree
index c18b550..f7d7a8a 100755
--- a/script/gentree
+++ b/script/gentree
@@ -136,7 +136,7 @@ do_prepwork() {
   chk chflags -R noschg "${root}/libexec"
   chk chflags -R noschg "${root}/sbin"
   chk chflags -R noschg "${root}/usr"
-  ( cd "${root}" && find . | cpio -p --link "${sroot}" ) || chk
+  ( cd "${root}" && find . | cpio -pl "${sroot}" ) || chk
 }
 
 do_admin() {
@@ -158,7 +158,7 @@ do_packages() {
   [ "${count}" -gt 0 ] || return
   log Install ${count} packages from "${pkgs##${base}/}"
   chk mkdir -p "${sroot}/pkg"
-  ( cd "${pkgs}" && find . | cpio -p --link "${sroot}/pkg" ) || chk
+  ( cd "${pkgs}" && find . | cpio -pl "${sroot}/pkg" ) || chk
   chk chroot "${sroot}" /bin/sh -c 'cd /pkg; exec pkg_add -F *'
   chk rm -Rf "${sroot}/pkg"
 }
@@ -255,7 +255,7 @@ do_prepetc() {
   log Prepare /etc
   chk mkdir -p "${sroot}/etc/local"
   chk mkdir -p "${sroot}/usr/local/etc" # Silence warnings
-  ( cd "${sroot}/usr/local/etc" && find . | cpio -p --link ../../../etc/local ) || chk
+  ( cd "${sroot}/usr/local/etc" && find . | cpio -pl ../../../etc/local ) || chk
   chk rm -Rf "${sroot}/usr/local/etc"
   chk ln -sf ../../etc/local "${sroot}/usr/local/etc"
 }
@@ -268,8 +268,8 @@ do_imgboot() {
   chk find "${sboot}/kernel" -type f -name '*.symbols' -delete
 
   # Link all modules into /modules, as an alternative search path
-  ( cd "${sboot}/kernel" && find . -name '*.ko' -o -name "${conf}" | cpio -p --link "${sroot}/modules" ) || chk
-  ( cd "${sboot}/modules" && find . -name '*.ko' -o -name "${conf}" | cpio -p --link "${sroot}/modules" ) || chk
+  ( cd "${sboot}/kernel" && find . -name '*.ko' -o -name "${conf}" | cpio -pl "${sroot}/modules" ) || chk
+  ( cd "${sboot}/modules" && find . -name '*.ko' -o -name "${conf}" | cpio -pl "${sroot}/modules" ) || chk
 
   # Remove all modules from the root fs that are preloaded by the preloader
   [ ! -f "${sboot}/loader.conf" ] || cat "${sboot}/loader.conf" | grep '_load=' | \
@@ -362,7 +362,7 @@ do_imgall() {
 
 do_custom() {
   log Patch in custom config
-  ( cd "${cnfd}" && find . -name '*.md_size' -o -print | cpio -p --link "${sconf}/default" ) || chk
+  ( cd "${cnfd}" && find . -name '*.md_size' -o -print | cpio -pl "${sconf}/default" ) || chk
   # Make sure files in default are newer than the tagfile, so they will be caught by saveconfig
   find "${sconf}/default" -type f -print0 | xargs -0 touch
   # If there are scavenged cpio.gz confpacks, touch their contents as well.
-- 
2.42.0