From 7af7abdcc099650e8d5311a4c7acb65e9d84d025 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 15 Jun 2011 10:15:20 +0100 Subject: [PATCH] Import patches-unapplied version 2.4 to ubuntu/oneiric Imported using git-ubuntu import. Changelog parent: d53152166c1d34c770e05800b2c5dd6fd8d38f52 New changelog entries: * Remove old config directory before creating a new configuration. --- debian/changelog | 6 ++++++ live-build/auto/config | 2 ++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 815cb896..ed1cfa9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.4) oneiric; urgency=low + + * Remove old config directory before creating a new configuration. + + -- Colin Watson Wed, 15 Jun 2011 10:15:20 +0100 + livecd-rootfs (2.3) oneiric; urgency=low * Set pipefail (bash-specific) in auto/build so that we fail immediately diff --git a/live-build/auto/config b/live-build/auto/config index 83a674c4..82c02459 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1,6 +1,8 @@ #! /bin/sh set -e +rm -rf config + if [ -z "$MIRROR" ]; then case $(hostname --fqdn) in bld-*.mmjgroup.com) ;;