Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-19 23:03:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass correct IMAGEFORMAT through to live-build from BuildLiveCD.

Browse Source
This commit is contained in:
Colin Watson 2011-06-15 10:21:36 +01:00
parent 7bd21e9406
commit 835b2be242
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BuildLiveCD
View File

@ -36,7 +36,7 @@ LIVE_BUILD=false
while getopts :s:d:f:pa:l name; do case $name in while getopts :s:d:f:pa:l name; do case $name in
s) SUBARCH="$OPTARG";; s) SUBARCH="$OPTARG";;
d) NEWSUITE="$OPTARG";; d) NEWSUITE="$OPTARG";;
f) IMAGEFORMAT="-f$OPTARG";; f) IMAGEFORMAT="$OPTARG";;
p) PROPOSED="-p";; p) PROPOSED="-p";;
a) APT_SOURCE="-A $OPTARG";; a) APT_SOURCE="-A $OPTARG";;
l) LIVE_BUILD=:;; l) LIVE_BUILD=:;;
@ -143,7 +143,7 @@ for STE in $SUITES; do
fi fi
COMMAND="PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build" COMMAND="PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
else else
COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}" COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
fi fi
if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && $COMMAND" >> ${LOG} 2>&1; then if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && $COMMAND" >> ${LOG} 2>&1; then
rm -f ${PUBDIR}current rm -f ${PUBDIR}current

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.5) UNRELEASED; urgency=low
* Pass correct IMAGEFORMAT through to live-build from BuildLiveCD.
-- Colin Watson <cjwatson@ubuntu.com> Wed, 15 Jun 2011 10:21:08 +0100
livecd-rootfs (2.4) oneiric; urgency=low livecd-rootfs (2.4) oneiric; urgency=low
* Remove old config directory before creating a new configuration. * Remove old config directory before creating a new configuration.