From fafd476b606bdb7c6332665ffe734b559ed06d68 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jun 2011 20:23:45 +0100 Subject: [PATCH] Fix permissions in BuildLiveCD when setting up auto directory. --- BuildLiveCD | 5 +---- debian/changelog | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/BuildLiveCD b/BuildLiveCD index 95b006d4..531ac0f0 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -136,10 +136,7 @@ for STE in $SUITES; do mkdir -p ${PUBDIR}${NOW} > ${LOG} if $LIVE_BUILD; then - mkdir -p "${DIR}/auto" - for f in config build clean; do - ln -s "/usr/share/livecd-rootfs/live-build/auto/$f" "${DIR}/auto/" - done + $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && rm -rf auto && mkdir -p auto && for f in config build clean; do ln -s /usr/share/livecd-rootfs/live-build/auto/\$f auto/; done" >> ${LOG} 2>&1 || true $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && lb clean --purge" >> ${LOG} 2>&1 || true if ! $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && SUITE=${STE} PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} IMAGEFORMAT=${IMAGEFORMAT} lb config" >> ${LOG} 2>&1; then exit 1 diff --git a/debian/changelog b/debian/changelog index a81b396f..c0ee856d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ livecd-rootfs (2.1) UNRELEASED; urgency=low * Fix ordering of log file creation in BuildLiveCD. + * Fix permissions in BuildLiveCD when setting up auto directory. -- Colin Watson Mon, 13 Jun 2011 19:42:59 +0100