diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2013-06-24 14:27:48 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-06-24 14:27:48 +0200 |
| commit | 57d26a0758d8cad227ee7fb0d322dc20f9afd64f (patch) | |
| tree | 84d3d0ce3368a4cef24fb7bab2f3c1d52f346401 /scripts | |
| parent | ec01ef8e6804b0f93c99d3a447eb2acc5be92c4e (diff) | |
| download | vyos-live-build-57d26a0758d8cad227ee7fb0d322dc20f9afd64f.tar.gz vyos-live-build-57d26a0758d8cad227ee7fb0d322dc20f9afd64f.zip | |
Using includes.installer instead of includes.debian-installer.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/config | 2 | ||||
| -rwxr-xr-x | scripts/build/installer_debian-installer | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/config b/scripts/build/config index 7fb50542a..3e8a646eb 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -1183,7 +1183,7 @@ EOF # Creating lb_binary_* configuration mkdir -p config/debian-installer mkdir -p config/includes.binary -mkdir -p config/includes.debian-installer +mkdir -p config/includes.installer mkdir -p config/packages.binary mkdir -p config/package-lists mkdir -p config/rootfs diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 3606b76f8..11b3a99c7 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -845,14 +845,14 @@ then fi fi -# 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)" ] +# Include content of config/includes.installer if exists and not empty +if [ -d config/includes.installer ] && [ -n "$(ls -A config/includes.installer)" ] then - Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/includes.debian-installer + Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/includes.installer if [ -e "${DESTDIR}"/"${INITRD_GI}" ] then - Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/includes.debian-installer + Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/includes.installer fi fi |