summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-10-22 20:43:21 +0200
committerDaniel Baumann <daniel@debian.org>2012-10-22 20:43:21 +0200
commitbb86b31b7b5e319617fed18e6db86aeaa733a0c9 (patch)
treefcd36472ea4e51ca682e35c36da49f96a59b3162 /scripts
parentb7c3e69b0df19df50d8a4e4f1352c3370f7cee8c (diff)
downloadvyos-live-build-bb86b31b7b5e319617fed18e6db86aeaa733a0c9.tar.gz
vyos-live-build-bb86b31b7b5e319617fed18e6db86aeaa733a0c9.zip
Renaming config/includes.binary_debian-installer to simply config/includes.debian-installer.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/binary_debian-installer8
-rwxr-xr-xscripts/build/config2
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index cbc4075d6..67122d9e7 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -851,14 +851,14 @@ then
fi
fi
-# Include content of config/includes.binary_debian-installer if exists and not empty
-if [ -d config/includes.binary_debian-installer ] && [ -n "$(ls -A config/includes.binary_debian-installer)" ]
+# Include content of config/includes.debian-installer if exists and not empty
+if [ -d config/includes.debian-installer ] && [ -n "$(ls -A config/includes.debian-installer)" ]
then
- Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/includes.binary_debian-installer
+ Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/includes.debian-installer
if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
then
- Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/includes.binary_debian-installer
+ Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/includes.debian-installer
fi
fi
diff --git a/scripts/build/config b/scripts/build/config
index f4598f8fa..dfcd7c0bf 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -1283,7 +1283,7 @@ EOF
# Creating lb_binary_* configuration
mkdir -p config/debian-installer
mkdir -p config/includes.binary
-mkdir -p config/includes.binary_debian-installer
+mkdir -p config/includes.debian-installer
mkdir -p config/packages.binary
mkdir -p config/package-lists
mkdir -p config/rootfs