summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-06-15 21:27:29 +0200
committerDaniel Baumann <daniel@debian.org>2011-06-15 21:27:29 +0200
commit36ecab10d372152acf7522d1d1f6274c938f72dd (patch)
treee391b76b998848a3b9c7ee8bf690b6ab82e06eb0
parent2312f18ef190e3d1ea997435a012b58551ba1459 (diff)
downloadvyos-live-build-36ecab10d372152acf7522d1d1f6274c938f72dd.tar.gz
vyos-live-build-36ecab10d372152acf7522d1d1f6274c938f72dd.zip
Using .list suffix in config/archives.
-rwxr-xr-xscripts/build/lb_chroot_archives12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index b85b70883..69ac751da 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -248,15 +248,15 @@ EOF
fi
# Check local sources.list
- if Find_files config/archives/*.chroot
+ if Find_files config/archives/*.chroot.list
then
- for FILE in config/archives/*.chroot
+ for FILE in config/archives/*.chroot.list
do
sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
-e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
-e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
- "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot).list"
+ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot.list).list"
done
fi
@@ -767,15 +767,15 @@ EOF
fi
# Check local sources.list
- if Find_files config/archives/*.binary
+ if Find_files config/archives/*.binary.list
then
- for FILE in config/archives/*.binary
+ for FILE in config/archives/*.binary.list
do
sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
-e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
-e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
- "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary).list"
+ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary.list).list"
done
fi