diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-09-07 17:33:53 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-09-07 17:33:53 +0200 |
| commit | 9119f24831c5d7e1b6d971607bd2774ebfb59454 (patch) | |
| tree | 73430ca09df8f7f31409311867ff9c00e21efddf /scripts/build/lb_chroot_apt | |
| parent | f8a313ac93fb91e7331007a1cf2b1cbc7592e610 (diff) | |
| download | vyos-live-build-9119f24831c5d7e1b6d971607bd2774ebfb59454.tar.gz vyos-live-build-9119f24831c5d7e1b6d971607bd2774ebfb59454.zip | |
Also respect config/packages for packages to be installed in both chroot and binary.
Diffstat (limited to 'scripts/build/lb_chroot_apt')
| -rwxr-xr-x | scripts/build/lb_chroot_apt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt index 5a097c787..6414701d4 100755 --- a/scripts/build/lb_chroot_apt +++ b/scripts/build/lb_chroot_apt @@ -108,7 +108,7 @@ case "${1}" in cp config/chroot_apt/preferences chroot/etc/apt/preferences fi - if Find_files config/packages.chroot/*.deb + if Find_files config/packages.chroot/*.deb || Find_files config/packages/*.deb then echo >> chroot/etc/apt/preferences echo "# Added by lb_chroot_apt ${@}" >> chroot/etc/apt/preferences @@ -236,7 +236,7 @@ EOF fi fi - if Find_files config/packages.chroot/*.deb + if Find_files config/packages.chroot/*.deb || Find_files config/packages/*.deb then if [ -f chroot/etc/apt/preferences ] then |