From 8e17cb0f2455064d150615365246451fd01db483 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 4 Dec 2010 12:02:15 +0000 Subject: [PATCH] Import patches-unapplied version 1.153 to ubuntu/natty Imported using git-ubuntu import. Changelog parent: ce1bd427427cce642bc287130802a113cca0f485 New changelog entries: * Update default suite in BuildLiveCD to natty. * Use --force-unsafe-io for all dpkg operations. If we crash we'll just destroy the chroot and start from scratch, so syncing is pointless. --- BuildLiveCD | 2 +- debian/changelog | 8 ++++++++ livecd.sh | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/BuildLiveCD b/BuildLiveCD index 4b7cf2a0..9e6db297 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -27,7 +27,7 @@ fi ARCH=$(dpkg --print-architecture) SUBARCH="" SUBARCHARG="" -NEWSUITE="maverick" +NEWSUITE="natty" SUITES="" PROPOSED="" IMAGEFORMAT="" diff --git a/debian/changelog b/debian/changelog index ed27fd10..a5ed640b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (1.153) natty; urgency=low + + * Update default suite in BuildLiveCD to natty. + * Use --force-unsafe-io for all dpkg operations. If we crash we'll just + destroy the chroot and start from scratch, so syncing is pointless. + + -- Colin Watson Sat, 04 Dec 2010 12:02:15 +0000 + livecd-rootfs (1.152) maverick; urgency=low * livecd.sh: diff --git a/livecd.sh b/livecd.sh index c7bc9b0a..64e8f25a 100755 --- a/livecd.sh +++ b/livecd.sh @@ -239,6 +239,11 @@ for FS in "$@"; do mount -t tmpfs -o size=8192M tmpfs ${ROOT} && echo using tmpfs fi + mkdir -p ${ROOT}etc/dpkg/dpkg.cfg.d + cat << @@EOF > ${ROOT}etc/dpkg/dpkg.cfg.d/livecd-rootfs +force-unsafe-io +@@EOF + mkdir -p ${ROOT}var/cache/debconf cat << @@EOF > ${ROOT}var/cache/debconf/config.dat Name: debconf/frontend @@ -719,6 +724,8 @@ Pin-Priority: 550 # And now that we're done messing with debconf, destroy the backup files: rm -f ${ROOT}/var/cache/debconf/*-old + rm -f ${ROOT}/etc/dpkg/dpkg.cfg.d/livecd-rootfs + # show the size of directories in /usr/share/doc checkpoint "Checking size of /usr/share/doc" echo BEGIN docdirs