diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-22 20:30:41 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-10-22 20:30:41 +0200 |
| commit | bd5f6bc104b5a875a417c6b90c8c9755b356d594 (patch) | |
| tree | 51f27b37cb86ca969619bd074594dfa81a632436 /scripts | |
| parent | fe3333bcb6b6ae661b66bf817d1b48168a424a34 (diff) | |
| download | vyos-live-build-bd5f6bc104b5a875a417c6b90c8c9755b356d594.tar.gz vyos-live-build-bd5f6bc104b5a875a417c6b90c8c9755b356d594.zip | |
Renaming config/binary_debian-installer to simply config/debian-installer.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/binary_debian-installer | 12 | ||||
| -rwxr-xr-x | scripts/build/config | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer index 9720961cf..cbc4075d6 100755 --- a/scripts/build/binary_debian-installer +++ b/scripts/build/binary_debian-installer @@ -686,9 +686,9 @@ then done # Local exclude file - if [ -e ../config/binary_debian-installer/udeb_exclude ] + if [ -e ../config/debian-installer/udeb_exclude ] then - cat ../config/binary_debian-installer/udeb_exclude >> exclude + cat ../config/debian-installer/udeb_exclude >> exclude fi # Excluding udebs from excludes because we want them to be in the image on purpose @@ -799,9 +799,9 @@ EOF esac # Including preseeding files - if Find_files config/binary_debian-installer/*.cfg + if Find_files config/debian-installer/*.cfg then - cp config/binary_debian-installer/*.cfg binary/install + cp config/debian-installer/*.cfg binary/install fi fi @@ -826,7 +826,7 @@ Repack_initrd() if [ ! -d "${INCLUDE_PATH}" ] then # Invoked the old way, just copy the preseeds - cp ../config/binary_debian-installer/*.cfg . + cp ../config/debian-installer/*.cfg . else # New way, include target directory content in the initrd REPACK_TMPDIR_ABS="${PWD}" @@ -841,7 +841,7 @@ Repack_initrd() } # Preseed d-i by repacking the initrd in certain situations -if [ "${DI_IMAGE_TYPE}" = "netboot" ] && [ -e config/binary_debian-installer/preseed.cfg ] +if [ "${DI_IMAGE_TYPE}" = "netboot" ] && [ -e config/debian-installer/preseed.cfg ] then Repack_initrd "${DESTDIR}"/"${INITRD_DI}" diff --git a/scripts/build/config b/scripts/build/config index c7a217a7d..357c3049b 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -1281,7 +1281,7 @@ LB_BACKPORTS="${LB_BACKPORTS}" EOF # Creating lb_binary_* configuration -mkdir -p config/binary_debian-installer +mkdir -p config/debian-installer mkdir -p config/binary_grub mkdir -p config/includes.binary mkdir -p config/includes.binary_debian-installer |