[SCM] live-build branch, debian-next, updated. debian/3.0_a35-1-4-g6c566e2
Daniel Baumann
daniel at debian.org
Wed Oct 12 18:08:21 UTC 2011
The following commit has been merged in the debian-next branch:
commit 6c566e21390e4170c7f529cb4c579e3d8672665e
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Oct 12 20:08:45 2011 +0200
Deal with non-existing preseed files in config tree.
diff --git a/scripts/build/lb_chroot_preseed b/scripts/build/lb_chroot_preseed
index 2323438..42059be 100755
--- a/scripts/build/lb_chroot_preseed
+++ b/scripts/build/lb_chroot_preseed
@@ -49,13 +49,16 @@ then
for PRESEED in config/preseed/*.preseed config/preseed/*.preseed.chroot
do
- # Copying local preseed
- cp "${PRESEED}" chroot/root/preseed
+ if [ -e "${PRESEED}" ]
+ then
+ # Copying local preseed
+ cp "${PRESEED}" chroot/root/preseed
- Chroot chroot "debconf-set-selections /root/preseed"
+ Chroot chroot "debconf-set-selections /root/preseed"
- # Removing local preseed file
- rm -f chroot/root/preseed
+ # Removing local preseed file
+ rm -f chroot/root/preseed
+ fi
done
# Remove dependency
--
live-build
More information about the debian-live-changes
mailing list