summaryrefslogtreecommitdiff
path: root/scripts/build/lb_chroot_task-lists
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-08-05 08:53:27 +0200
committerDaniel Baumann <daniel@debian.org>2011-08-08 08:10:07 +0200
commit724f5b4dc82d2b77279a8daad715878a14a41090 (patch)
treec9c7b66ba2422e487d9f3ebd94c6ea56002c27b4 /scripts/build/lb_chroot_task-lists
parent8a0da5726657de9024197bdb4c17f35423199a0a (diff)
downloadvyos-live-build-724f5b4dc82d2b77279a8daad715878a14a41090.tar.gz
vyos-live-build-724f5b4dc82d2b77279a8daad715878a14a41090.zip
Also using definition files without suffix (so that e.g. foo.list is used for both chroot and binary stage).
Diffstat (limited to 'scripts/build/lb_chroot_task-lists')
-rwxr-xr-xscripts/build/lb_chroot_task-lists7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/build/lb_chroot_task-lists b/scripts/build/lb_chroot_task-lists
index 57f5518b1..1377ad1c5 100755
--- a/scripts/build/lb_chroot_task-lists
+++ b/scripts/build/lb_chroot_task-lists
@@ -41,10 +41,13 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if ls config/task-lists/*.list.chroot > /dev/null 2>&1 || \
+if ls config/task-lists/*.list > /dev/null 2>&1 || \
+ ls config/task-lists/*.list.chroot > /dev/null 2>&1 || \
ls config/task-lists/*.list.chroot_${_PASS} > /dev/null 2>&1
then
- for LIST in config/task-lists/*.list.chroot config/task-lists/*.list.chroot_${_PASS}
+ for LIST in config/task-lists/*.list \
+ config/task-lists/*.list.chroot \
+ config/task-lists/*.list.chroot_${_PASS}
do
if [ -e "${LIST}" ]
then