diff options
author | Raphaël Hertzog <hertzog@debian.org> | 2016-11-28 22:50:42 +0100 |
---|---|---|
committer | Raphaël Hertzog <hertzog@debian.org> | 2016-11-28 22:50:46 +0100 |
commit | 02d933fc17c6355a180f8af5ab98365d173215d5 (patch) | |
tree | fe245a27e0deab36d35c0afdde077cab65a70cab | |
parent | 5a169a6fe6c0915eea729739e513e4265e2d4e6f (diff) | |
download | vyos-live-build-02d933fc17c6355a180f8af5ab98365d173215d5.tar.gz vyos-live-build-02d933fc17c6355a180f8af5ab98365d173215d5.zip |
Fix Check_installed function when checking against host
Thanks to jnqnfe for the report.
Closes: #774807
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | functions/packages.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 1dbda316b..30599a09a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ live-build (1:20160105) UNRELEASED; urgency=medium * Drop an optimization in chroot_archives that has undesired side-effects. Thanks to jnqnfe for the patch. Closes: #775989 * Drop gpgv and debian-keyring from Suggests. + * Fix Check_installed function when checking against host. Thanks to jnqnfe + for the report. Closes: #774807 [ Kristian Klausen ] * Include ext{3,4} journal size when calculating image size. Closes: #801712 diff --git a/functions/packages.sh b/functions/packages.sh index 477d3379a..c2f7cfabf 100755 --- a/functions/packages.sh +++ b/functions/packages.sh @@ -82,7 +82,7 @@ Check_installed () else if which dpkg-query > /dev/null 2>&1 then - if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install" + if dpkg-query -s "${PACKAGE}" 2> /dev/null | grep -qs "Status: install" then INSTALL_STATUS=0 else |