summaryrefslogtreecommitdiff
path: root/scripts/build/lb_chroot_install-packages
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_install-packages
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_install-packages')
-rwxr-xr-xscripts/build/lb_chroot_install-packages8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/lb_chroot_install-packages b/scripts/build/lb_chroot_install-packages
index cd3c17825..37d055a91 100755
--- a/scripts/build/lb_chroot_install-packages
+++ b/scripts/build/lb_chroot_install-packages
@@ -42,7 +42,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if [ -e chroot/root/chroot_packages ] && [ -s chroot/root/chroot_packages ]
+if [ -e chroot/root/packages.chroot ] && [ -s chroot/root/packages.chroot ]
then
# Restoring cache
Restore_cache cache/packages_chroot
@@ -50,16 +50,16 @@ then
# Installing packages
case "${LB_APT}" in
apt|apt-get)
- Chroot chroot "xargs --arg-file=/root/chroot_packages apt-get ${APT_OPTIONS} install"
+ Chroot chroot "xargs --arg-file=/root/packages.chroot apt-get ${APT_OPTIONS} install"
;;
aptitude)
- Chroot chroot "xargs --arg-file=/root/chroot_packages aptitude ${APTITUDE_OPTIONS} install"
+ Chroot chroot "xargs --arg-file=/root/packages.chroot aptitude ${APTITUDE_OPTIONS} install"
;;
esac
# Tidying up
- rm -f chroot/root/chroot_packages
+ rm -f chroot/root/packages.chroot
# Saving cache
Save_cache cache/packages_chroot