summaryrefslogtreecommitdiff
path: root/functions/packages.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-10-28 16:44:06 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:43 +0100
commit1c1e7db6c44d639fd51ee23061087c7d14b6ef6b (patch)
treee20b0cfa3a45140a39be0cadf45410eab5cc22e7 /functions/packages.sh
parent6696b019fe03a371d69c50a1ef82223e4bb364a7 (diff)
downloadvyos-live-build-1c1e7db6c44d639fd51ee23061087c7d14b6ef6b.tar.gz
vyos-live-build-1c1e7db6c44d639fd51ee23061087c7d14b6ef6b.zip
Generalizing internal Chroot(); by requiring its first argument to be the chroot directory.
Diffstat (limited to 'functions/packages.sh')
-rwxr-xr-xfunctions/packages.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/functions/packages.sh b/functions/packages.sh
index ed1bdc4a9..f1796caa4 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -34,11 +34,11 @@ Install_package ()
then
case "${LH_APT}" in
apt|apt-get)
- Chroot "apt-get install -o APT::Install-Recommends=false --yes ${_LH_PACKAGES}"
+ Chroot chroot "apt-get install -o APT::Install-Recommends=false --yes ${_LH_PACKAGES}"
;;
aptitude)
- Chroot "aptitude install --without-recommends --assume-yes ${_LH_PACKAGES}"
+ Chroot chroot "aptitude install --without-recommends --assume-yes ${_LH_PACKAGES}"
;;
esac
fi
@@ -50,11 +50,11 @@ Remove_package ()
then
case "${LH_APT}" in
apt|apt-get)
- Chroot "apt-get remove --purge --yes ${_LH_PACKAGES}"
+ Chroot chroot "apt-get remove --purge --yes ${_LH_PACKAGES}"
;;
aptitude)
- Chroot "aptitude purge --assume-yes ${_LH_PACKAGES}"
+ Chroot chroot "aptitude purge --assume-yes ${_LH_PACKAGES}"
;;
esac
fi
@@ -72,7 +72,7 @@ Check_installed ()
case "${LH_CHROOT_BUILD}" in
enabled)
- if Chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"
+ if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"
then
INSTALL_STATUS=0
else
@@ -82,7 +82,7 @@ Check_installed ()
disabled)
if which dpkg-query > /dev/null 2>&1
then
- if Chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"
+ if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install"
then
INSTALL_STATUS=0
else