summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-09-16 18:16:19 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:23 +0100
commitdb013cdde0b4dbdc995cd23fa4d31bb69f5b42b3 (patch)
treedf8dcaf6c7ca5f10a1a458652d6a2f79a8000893 /scripts/build
parente02b31b73b8a01c28ffe6479a175b58a4dc389ff (diff)
downloadvyos-live-build-db013cdde0b4dbdc995cd23fa4d31bb69f5b42b3.tar.gz
vyos-live-build-db013cdde0b4dbdc995cd23fa4d31bb69f5b42b3.zip
Allowing also symlinks in chroot_local-packages (Closes: #593186).
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/lb_chroot_sources20
1 files changed, 18 insertions, 2 deletions
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index d5dfeea19..84c475634 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -204,12 +204,28 @@ EOF
# Copy packages
if Find_files config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb
then
- cp ${CP_OPTIONS} config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb chroot/root/local-packages
+ for FILE in config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb
+ do
+ if [ -L "${FILE}" ]
+ then
+ cp -L config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb chroot/root/local-packages
+ else
+ cp ${CP_OPTIONS} config/chroot_local-packages/*_"${LB_ARCHITECTURE}".deb chroot/root/local-packages
+ fi
+ done
fi
if Find_files config/chroot_local-packages/*_all.deb
then
- cp ${CP_OPTIONS} config/chroot_local-packages/*_all.deb chroot/root/local-packages
+ for FILE in config/chroot_local-packages/*_all.deb
+ do
+ if [ -L "${FILE}" ]
+ then
+ cp -L config/chroot_local-packages/*_all.deb chroot/root/local-packages
+ else
+ cp ${CP_OPTIONS} config/chroot_local-packages/*_all.deb chroot/root/local-packages
+ fi
+ done
fi
if Find_files chroot/root/local-packages/*.deb