manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renaming config/binary_debian-installer to simply config/debian-installer.

This commit is contained in:
Daniel Baumann 2012-10-22 20:30:41 +02:00
parent fe3333bcb6
commit bd5f6bc104
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions/defaults.sh
View File

@ -954,14 +954,14 @@ Set_defaults ()
# Setting debian-installer preseed filename # Setting debian-installer preseed filename
if [ -z "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ] if [ -z "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ]
then then
if Find_files config/binary_debian-installer/preseed.cfg if Find_files config/debian-installer/preseed.cfg
then then
LB_DEBIAN_INSTALLER_PRESEEDFILE="/preseed.cfg" LB_DEBIAN_INSTALLER_PRESEEDFILE="/preseed.cfg"
fi fi
if Find_files config/binary_debian-installer/*.cfg && [ ! -e config/binary_debian-installer/preseed.cfg ] if Find_files config/debian-installer/*.cfg && [ ! -e config/debian-installer/preseed.cfg ]
then then
Echo_warning "You have placed some preseeding files into config/binary_debian-installer but you didn't specify the default preseeding file through LB_DEBIAN_INSTALLER_PRESEEDFILE. This means that debian-installer will not take up a preseeding file by default." Echo_warning "You have placed some preseeding files into config/debian-installer but you didn't specify the default preseeding file through LB_DEBIAN_INSTALLER_PRESEEDFILE. This means that debian-installer will not take up a preseeding file by default."
fi fi
fi fi

12
scripts/build/binary_debian-installer
View File

@ -686,9 +686,9 @@ then
done done
# Local exclude file # Local exclude file
if [ -e ../config/binary_debian-installer/udeb_exclude ] if [ -e ../config/debian-installer/udeb_exclude ]
then then
cat ../config/binary_debian-installer/udeb_exclude >> exclude cat ../config/debian-installer/udeb_exclude >> exclude
fi fi
# Excluding udebs from excludes because we want them to be in the image on purpose # Excluding udebs from excludes because we want them to be in the image on purpose
@ -799,9 +799,9 @@ EOF
esac esac
# Including preseeding files # Including preseeding files
if Find_files config/binary_debian-installer/*.cfg if Find_files config/debian-installer/*.cfg
then then
cp config/binary_debian-installer/*.cfg binary/install cp config/debian-installer/*.cfg binary/install
fi fi
fi fi
@ -826,7 +826,7 @@ Repack_initrd()
if [ ! -d "${INCLUDE_PATH}" ] if [ ! -d "${INCLUDE_PATH}" ]
then then
# Invoked the old way, just copy the preseeds # Invoked the old way, just copy the preseeds
cp ../config/binary_debian-installer/*.cfg . cp ../config/debian-installer/*.cfg .
else else
# New way, include target directory content in the initrd # New way, include target directory content in the initrd
REPACK_TMPDIR_ABS="${PWD}" REPACK_TMPDIR_ABS="${PWD}"
@ -841,7 +841,7 @@ Repack_initrd()
} }
# Preseed d-i by repacking the initrd in certain situations # 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 then
Repack_initrd "${DESTDIR}"/"${INITRD_DI}" Repack_initrd "${DESTDIR}"/"${INITRD_DI}"

2
scripts/build/config
View File

@ -1281,7 +1281,7 @@ LB_BACKPORTS="${LB_BACKPORTS}"
EOF EOF
# Creating lb_binary_* configuration # Creating lb_binary_* configuration
mkdir -p config/binary_debian-installer mkdir -p config/debian-installer
mkdir -p config/binary_grub mkdir -p config/binary_grub
mkdir -p config/includes.binary mkdir -p config/includes.binary
mkdir -p config/includes.binary_debian-installer mkdir -p config/includes.binary_debian-installer