Put schroot configuration in chroot.d/sbuild-$chroot (LP: #736808)

This commit is contained in:
Stefano Rivera 2011-04-24 19:11:41 +02:00
parent 427aad7b15
commit dceda81ff2
2 changed files with 8 additions and 8 deletions

1
debian/changelog vendored
View File

@ -8,6 +8,7 @@ ubuntu-dev-tools (0.123) UNRELEASED; urgency=low
- Reformat manpage.
- Install qemu-user-static instead of qemu-kvm-extras-static.
- Correctly substitute release into security suite name.
- Put schroot configuration in chroot.d/sbuild-$chroot (LP: #736808)
-- Stefano Rivera <stefanor@debian.org> Sun, 24 Apr 2011 12:45:31 +0200

View File

@ -551,14 +551,13 @@ fi
if [ ! -z "$SCHROOT_CONF_SUFFIX" ]; then
echo "$SCHROOT_CONF_SUFFIX" >> "$TEMP_SCHROOTCONF"
fi
cat "$TEMP_SCHROOTCONF" | sed \
-e "s|CHROOT_NAME|$CHROOT_NAME|g" \
-e "s|CHROOT_PATH|$CHROOT_PATH|g" \
-e "s|SNAPSHOT_SIZE|$SNAPSHOT_SIZE|g" \
-e "s|SCHROOT_TYPE|$SCHROOT_TYPE|g" \
-e "s|CHROOT_SNAPSHOT_DIR|$CHROOT_SNAPSHOT_DIR|g" \
| \
sudo bash -c "cat >> /etc/schroot/schroot.conf"
sed -e "s|CHROOT_NAME|$CHROOT_NAME|g" \
-e "s|CHROOT_PATH|$CHROOT_PATH|g" \
-e "s|SNAPSHOT_SIZE|$SNAPSHOT_SIZE|g" \
-e "s|SCHROOT_TYPE|$SCHROOT_TYPE|g" \
-e "s|CHROOT_SNAPSHOT_DIR|$CHROOT_SNAPSHOT_DIR|g" \
"$TEMP_SCHROOTCONF" \
| sudo tee "/etc/schroot/chroot.d/sbuild-$CHROOT_NAME" > /dev/null
rm -f "$TEMP_SCHROOTCONF"
# Disable daemons in chroot: