summaryrefslogtreecommitdiff
path: root/scripts/build/lb_chroot_archives
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-09-07 15:59:48 +0200
committerDaniel Baumann <daniel@debian.org>2011-09-07 15:59:48 +0200
commite82aa251347d0f6a55ed2c74e670631914249556 (patch)
tree4e0fe7a89032a576eee73386ff59dc34bc17b4e5 /scripts/build/lb_chroot_archives
parent65f626fe9cd4e8777b97490bed5ba373d681ca3b (diff)
downloadvyos-live-build-e82aa251347d0f6a55ed2c74e670631914249556.tar.gz
vyos-live-build-e82aa251347d0f6a55ed2c74e670631914249556.zip
Renaming config/chroot_packages to config/packages.chroot.
Diffstat (limited to 'scripts/build/lb_chroot_archives')
-rwxr-xr-xscripts/build/lb_chroot_archives22
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 2b185cd71..ab767abcb 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -277,39 +277,39 @@ EOF
fi
# Configure local package repository
- if Find_files config/chroot_packages/*.deb
+ if Find_files config/packages.chroot/*.deb
then
rm -rf chroot/root/packages
mkdir -p chroot/root/packages
- if [ "$(stat --printf %d config/chroot_packages)" = "$(stat --printf %d chroot/root/packages)" ]
+ if [ "$(stat --printf %d config/packages.chroot)" = "$(stat --printf %d chroot/root/packages)" ]
then
CP_OPTIONS="-l"
fi
# Copy packages
- if Find_files config/chroot_packages/*_"${LB_ARCHITECTURES}".deb
+ if Find_files config/packages.chroot/*_"${LB_ARCHITECTURES}".deb
then
- for FILE in config/chroot_packages/*_"${LB_ARCHITECTURES}".deb
+ for FILE in config/packages.chroot/*_"${LB_ARCHITECTURES}".deb
do
if [ -L "${FILE}" ]
then
- cp -L config/chroot_packages/*_"${LB_ARCHITECTURES}".deb chroot/root/packages
+ cp -L config/packages.chroot/*_"${LB_ARCHITECTURES}".deb chroot/root/packages
else
- cp ${CP_OPTIONS} config/chroot_packages/*_"${LB_ARCHITECTURES}".deb chroot/root/packages
+ cp ${CP_OPTIONS} config/packages.chroot/*_"${LB_ARCHITECTURES}".deb chroot/root/packages
fi
done
fi
- if Find_files config/chroot_packages/*_all.deb
+ if Find_files config/packages.chroot/*_all.deb
then
- for FILE in config/chroot_packages/*_all.deb
+ for FILE in config/packages.chroot/*_all.deb
do
if [ -L "${FILE}" ]
then
- cp -L config/chroot_packages/*_all.deb chroot/root/packages
+ cp -L config/packages.chroot/*_all.deb chroot/root/packages
else
- cp ${CP_OPTIONS} config/chroot_packages/*_all.deb chroot/root/packages
+ cp ${CP_OPTIONS} config/packages.chroot/*_all.deb chroot/root/packages
fi
done
fi
@@ -432,7 +432,7 @@ EOF
if Find_files chroot/root/packages/*.deb
then
gunzip < chroot/root/packages/Packages.gz | awk '/^Package: / { print $2 }' \
- >> chroot/root/chroot_packages
+ >> chroot/root/packages.chroot
fi
# Update indices from cache