summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2014-04-25 20:59:43 +0200
committerDaniel Baumann <mail@daniel-baumann.ch>2014-04-25 21:00:56 +0200
commitcce1e47ce8d4b50f5f9384f4aa499c1dfe992837 (patch)
treef64a72ff1d7394f2af6e02bcc8b443810e353a52 /scripts
parent7a52186c1b4a8b5896307189701403689bac9145 (diff)
downloadvyos-live-build-cce1e47ce8d4b50f5f9384f4aa499c1dfe992837.tar.gz
vyos-live-build-cce1e47ce8d4b50f5f9384f4aa499c1dfe992837.zip
Correcting required installer package determination to avoid extra packages, thanks to Benjamin Moody <benjamin.moody@gmail.com> (Closes: #739729).
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/installer_debian-installer4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index f6630161c..6415ffffd 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -477,11 +477,11 @@ then
# Drop the packages already installed that d-i doesn't explicitely need
_REMAINING_PACKAGES="$(echo ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES} | sed -e 's# #|#g')"
- _REMAINING_PACKAGES="$(sed -n -e 's|Package: ||p' chroot/var/lib/dpkg/status.tmp | grep -E -v \"^${_REMAINING_PACKAGES}$\")"
+ _REMAINING_PACKAGES="$(sed -n -e 's|Package: ||p' chroot/var/lib/dpkg/status.tmp | grep -E -v "^(${_REMAINING_PACKAGES})\$")"
for _PACKAGE in ${_REMAINING_PACKAGES}
do
- rm -f "chroot/binary.deb/archives/${_PACKAGE}_*.deb"
+ rm -f chroot/binary.deb/archives/${_PACKAGE}_*.deb
done
else
# Download .debs of the required packages