summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2013-08-07 18:13:37 +0200
committerDaniel Baumann <mail@daniel-baumann.ch>2013-08-07 18:14:23 +0200
commitd75e7b75c083c80170cc53f5be50844e7e9f7a38 (patch)
tree3203718dce5c97b7676c58a3f6c549490c1c275c /scripts
parentd758af1392991b567aa493ebcf352d6652a2bbf1 (diff)
downloadvyos-live-build-d75e7b75c083c80170cc53f5be50844e7e9f7a38.tar.gz
vyos-live-build-d75e7b75c083c80170cc53f5be50844e7e9f7a38.zip
Renaming some leftover pieces from binary_debian-installer to installer_debian-installer.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/installer_debian-installer16
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index 09f2069eb..1117e6567 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -55,7 +55,7 @@ Echo_message "Begin installing debian-installer..."
Require_stagefile .build/config .build/bootstrap
# Checking stage file
-Check_stagefile .build/binary_debian-installer
+Check_stagefile .build/installer_debian-installer
# Checking lock file
Check_lockfile .lock
@@ -208,7 +208,7 @@ Install_file() {
# Set absolute directory for caching; we require it when we call Download_file
# from a non-standard cwd.
-_LB_CACHE_DIR="$(pwd)/cache/binary_debian-installer"
+_LB_CACHE_DIR="$(pwd)/cache/installer_debian-installer"
Download_file () {
local _LB_TARGET
@@ -611,10 +611,10 @@ then
for UDEB in ${UDEBS}
do
- if [ -f ../cache/packages.binary_debian-installer.udeb/"$(basename ${UDEB})" ]
+ if [ -f ../cache/packages.installer_debian-installer.udeb/"$(basename ${UDEB})" ]
then
# Copying cached udebs
- cp ../cache/packages.binary_debian-installer.udeb/"$(basename ${UDEB})" ./
+ cp ../cache/packages.installer_debian-installer.udeb/"$(basename ${UDEB})" ./
else
# Downloading udebs
if ! ls "$(basename ${UDEB} | awk -F_ '{ print $1 }')"_* > /dev/null 2>&1
@@ -625,9 +625,9 @@ then
done
# Caching udebs
- rm -rf ../cache/packages.binary_debian-installer.udeb
- mkdir -p ../cache/packages.binary_debian-installer.udeb
- cp *.udeb ../cache/packages.binary_debian-installer.udeb
+ rm -rf ../cache/packages.installer_debian-installer.udeb
+ mkdir -p ../cache/packages.installer_debian-installer.udeb
+ cp *.udeb ../cache/packages.installer_debian-installer.udeb
# Including local udebs
if Find_files ../config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb || Find_files ../config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb
@@ -879,4 +879,4 @@ Save_cache cache/packages.binary
Remove_package
# Creating stage file
-Create_stagefile .build/binary_debian-installer
+Create_stagefile .build/installer_debian-installer