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

Renaming and reworking previous chroot_local-preseed into chroot_preseed, now looking for config/preseed/*.preseed{,.chroot} files.

This commit is contained in:
Daniel Baumann 2011-09-28 09:53:58 +02:00
parent fbc5aa8291
commit 432402e32b
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build/lb_chroot
View File

@ -53,7 +53,7 @@ lb chroot_archives chroot install ${*}
# Customizing chroot
lb chroot_linux-image ${*}
lb chroot_local-preseed ${*}
lb chroot_preseed ${*}
for _PASS in install live
do

9
scripts/build/lb_chroot_local-preseed → scripts/build/lb_chroot_preseed
View File

@ -30,7 +30,7 @@ Echo_message "Begin executing local preseeds..."
Require_stagefile .stage/config .stage/bootstrap
# Checking stage file
Check_stagefile .stage/chroot_local-preseed
Check_stagefile .stage/chroot_preseed
# Checking lock file
Check_lockfile .lock
@ -38,7 +38,8 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
if Find_files config/chroot_local-preseed/*
if ls config/preseed/*.preseed > /dev/null 2>&1 || \
ls config/preseed/*.preseed.chroot > /dev/null 2>&1
then
# Check dependency
Check_package chroot/usr/bin/debconf-set-selections debconf
@ -46,7 +47,7 @@ then
# Install dependency
Install_package
for PRESEED in config/chroot_local-preseed/*
for PRESEED in config/chroot_preseed/*.preseed config/chroot_preseed/*.preseed.chroot
do
# Copying local preseed
cp "${PRESEED}" chroot/root/preseed
@ -61,5 +62,5 @@ then
Remove_package
# Creating stage file
Create_stagefile .stage/chroot_local-preseed
Create_stagefile .stage/chroot_preseed
fi

6
scripts/build/lb_config
View File

@ -198,7 +198,7 @@ Local_arguments ()
Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
# Dump contents of directories that contain text files
for DIRECTORY in config/package-lists config/task-lists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs
for DIRECTORY in config/package-lists config/task-lists config/chroot_apt config/chroot_local-patches config/preseed config/binary_rootfs
do
if Find_files "${DIRECTORY}"
then
@ -1172,7 +1172,7 @@ mkdir -p config/chroot_local-patches
mkdir -p config/packages
mkdir -p config/packages.chroot
mkdir -p config/package-lists
mkdir -p config/chroot_local-preseed
mkdir -p config/preseed
mkdir -p config/task-lists
cat > config/chroot << EOF
@ -1422,7 +1422,7 @@ then
then
Echo_warning "Please install 'debconf-utils' in order to use this feature."
else
debconf-get-selections | grep -v deinstall | cut -f1 > config/chroot_local-preseed/local-system
debconf-get-selections | grep -v deinstall | cut -f1 > config/preseed/local.preseed.chroot
fi
fi