mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-22 19:01:30 +00:00
BuildLiveCD cleanup from deployment
This commit is contained in:
parent
f63437ae8f
commit
943022fd17
@ -30,12 +30,12 @@ SUBARCHARG=""
|
||||
NEWSUITE="maverick"
|
||||
SUITES=""
|
||||
PROPOSED=""
|
||||
IMAGEFORMAT="squashfs"
|
||||
IMAGEFORMAT=""
|
||||
|
||||
while getopts :s:d:f:p name; do case $name in
|
||||
s) SUBARCH="$OPTARG";;
|
||||
d) NEWSUITE="$OPTARG";;
|
||||
f) IMAGEFORMAT="$OPTARG";;
|
||||
f) IMAGEFORMAT="-f$OPTARG";;
|
||||
p) PROPOSED="-p";;
|
||||
esac; done;
|
||||
shift $((OPTIND-1))
|
||||
@ -120,7 +120,7 @@ for STE in $SUITES; do
|
||||
rm -f ${PUBDIR}latest
|
||||
ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest
|
||||
mkdir -p ${PUBDIR}${NOW}
|
||||
if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} -f${IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} $arg" > ${LOG} 2>&1; then
|
||||
if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} ${IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} $arg" > ${LOG} 2>&1; then
|
||||
rm -f ${PUBDIR}current
|
||||
ln -sf ${NOW} ${PUBDIR}current
|
||||
|
||||
|
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,3 +1,10 @@
|
||||
livecd-rootfs (1.121) UNRELEASED; urgency=low
|
||||
|
||||
* BuildLiveCD: only pass -f if we were told it, since older chroots don't
|
||||
support it.
|
||||
|
||||
-- LaMont Jones <lamont@ubuntu.com> Wed, 16 Jun 2010 16:44:24 -0600
|
||||
|
||||
livecd-rootfs (1.120) maverick; urgency=low
|
||||
|
||||
* add special case to ubuntu-netbook on omap3 and 4, we want jasper instead of
|
||||
|
Loading…
x
Reference in New Issue
Block a user