diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-06-03 08:26:38 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-06-03 08:27:16 +0200 |
| commit | a666a80a4fa2739ba7dcdfa77926ea1c0d458c88 (patch) | |
| tree | dfaba7a8c93aef546eaa4e163653ca786c5b77e1 | |
| parent | 5953d2c9489c3ea808fed62073209ab03cc0a953 (diff) | |
| download | vyos-live-build-a666a80a4fa2739ba7dcdfa77926ea1c0d458c88.tar.gz vyos-live-build-a666a80a4fa2739ba7dcdfa77926ea1c0d458c88.zip | |
Renaming config/binary_debian-installer-includes to config/includes.binary_debian-installer for consistency with the other include directories.
| -rwxr-xr-x | scripts/build/lb_binary_debian-installer | 8 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index a3098984a..f2f7b20e6 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -831,14 +831,14 @@ then fi fi -# Include content of config/binary_debian-installer-includes if exists and not empty -if [ -d config/binary_debian-installer-includes ] && [ -n "$(ls -A config/binary_debian-installer-includes)" ] +# 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)" ] then - Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/binary_debian-installer-includes + Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/includes.binary_debian-installer if [ -e "${DESTDIR}"/"${INITRD_GI}" ] then - Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/binary_debian-installer-includes + Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/includes.binary_debian-installer fi fi diff --git a/scripts/build/lb_config b/scripts/build/lb_config index f1ae30cdf..987ce494f 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -1271,9 +1271,9 @@ EOF # Creating lb_binary_* configuration mkdir -p config/binary_debian-installer -mkdir -p config/binary_debian-installer-includes mkdir -p config/binary_grub mkdir -p config/includes.binary +mkdir -p config/includes.binary_debian-installer mkdir -p config/packages.binary mkdir -p config/package-lists mkdir -p config/binary_rootfs |