diff options
author | Daniel Baumann <daniel@debian.org> | 2011-06-15 21:37:10 +0200 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2011-06-15 21:37:10 +0200 |
commit | 9d905734e5c3950ab74d29c08d10ca58472e114d (patch) | |
tree | bc8eb92095d46fe1d2b50f21c7832e755af06d6f /scripts/build/lb_chroot_local-packagelists | |
parent | 36ecab10d372152acf7522d1d1f6274c938f72dd (diff) | |
download | vyos-live-build-9d905734e5c3950ab74d29c08d10ca58472e114d.tar.gz vyos-live-build-9d905734e5c3950ab74d29c08d10ca58472e114d.zip |
Unifying config/chroot_local-packagelists and config/binary_local-packagelists.
Rather than using config/chroot_local-packagelists/*.list and
config/binary_local-packagelists/*.list, we're simply using
config/package-lists/*.chroot.list and
config/package-lists/*.binary.list.
Diffstat (limited to 'scripts/build/lb_chroot_local-packagelists')
-rwxr-xr-x | scripts/build/lb_chroot_local-packagelists | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/lb_chroot_local-packagelists b/scripts/build/lb_chroot_local-packagelists index 20566e9ab..a2160be73 100755 --- a/scripts/build/lb_chroot_local-packagelists +++ b/scripts/build/lb_chroot_local-packagelists @@ -41,15 +41,15 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if ls config/chroot_local-packagelists/*.list > /dev/null 2>&1 || \ - ls config/chroot_local-packagelists/*.list.${_PASS} > /dev/null 2>&1 +if ls config/package-lists/*.chroot.list > /dev/null 2>&1 || \ + ls config/package-lists/*.chroot_${_PASS}.list > /dev/null 2>&1 then - for LIST in config/chroot_local-packagelists/*.list config/chroot_local-packagelists/*.list.${_PASS} + for LIST in config/package-lists/*.chroot.list config/package-lists/*.chroot_${_PASS}.list do if [ -e "${LIST}" ] then # Generating local package list - Expand_packagelist "$(basename ${LIST})" "config/chroot_local-packagelists" \ + Expand_packagelist "$(basename ${LIST})" "config/package-lists" \ >> chroot/root/chroot_packages fi done |