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

extended BuildLiveCD to handle the -f switch

Browse Source
This commit is contained in:
Michael Casadevall 2010-05-17 15:34:45 -04:00
parent 6c1b069004
commit f5c8c36a6c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BuildLiveCD
View File

@ -31,6 +31,7 @@ DEFAULTSUITE="karmic"
NEWSUITE="" NEWSUITE=""
SUITES="" SUITES=""
PROPOSED="" PROPOSED=""
IMAGEFORMAT=""
if [ "$1" = '-s' ]; then if [ "$1" = '-s' ]; then
shift shift
SUBARCH="$1" SUBARCH="$1"
@ -48,6 +49,11 @@ if [ "$1" = '-d' ]; then
else else
NEWSUITE="$DEFAULTSUITE" NEWSUITE="$DEFAULTSUITE"
fi fi
if [ "$1" = '-f' ]; then
shift
IMAGEFORMAT=$1
shift
fi
for s in $NEWSUITE; do for s in $NEWSUITE; do
if [ -d build-${s}-live/chroot-${s} ]; then SUITES="$SUITES $s"; fi if [ -d build-${s}-live/chroot-${s} ]; then SUITES="$SUITES $s"; fi
done done
@ -128,7 +134,7 @@ for STE in $SUITES; do
rm -f ${PUBDIR}latest rm -f ${PUBDIR}latest
ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest
mkdir -p ${PUBDIR}${NOW} mkdir -p ${PUBDIR}${NOW}
if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} ${ARCHARG} $arg" > ${LOG} 2>&1; then if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} ${ARCHARG} ${IMAGEFORMAT} $arg" > ${LOG} 2>&1; then
rm -f ${PUBDIR}current rm -f ${PUBDIR}current
ln -sf ${NOW} ${PUBDIR}current ln -sf ${NOW} ${PUBDIR}current

1
debian/changelog vendored
View File

@ -3,6 +3,7 @@ livecd-rootfs (1.116) UNRELEASED; urgency=low
* added new -f switch for changing image build type * added new -f switch for changing image build type
* added support for building ext2 and ext3 images in addition to squashfs * added support for building ext2 and ext3 images in addition to squashfs
* fixed spacing in the livefs build code * fixed spacing in the livefs build code
* extended BuildLiveCD to handle the -f switch
-- Michael Casadevall <mcasadevall@ubuntu.com> Mon, 17 May 2010 13:59:28 -0400 -- Michael Casadevall <mcasadevall@ubuntu.com> Mon, 17 May 2010 13:59:28 -0400