diff --git a/debian/changelog b/debian/changelog index aee51826..b2cf42bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.138) UNRELEASED; urgency=low + + * also move the sources.list.d dir out of the way on ubuntu-touch + + -- Oliver Grawert Tue, 28 May 2013 15:17:46 +0200 + livecd-rootfs (2.137) saucy; urgency=low * clear up /var/lib/initramfs-tools/ in the chroot after building initrds diff --git a/live-build/auto/build b/live-build/auto/build index e093e98b..f8817839 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -413,6 +413,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then lb chroot_devpts install "$@" mv "${sourceslist}" "${sourceslist}.orig" + mv "${sourceslist}.d" "${sourceslist}.d.orig" echo "deb http://ftpmaster.internal/ubuntu/ $codename main universe" >$sourceslist Chroot chroot "apt-get -y update" @@ -439,7 +440,8 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then Chroot chroot "apt-get -y purge crda wireless-regdb" Chroot chroot "apt-get -y clean" - mv $sourceslist.orig $sourceslist + mv "${sourceslist}.orig" "${sourceslist}" + mv "${sourceslist}.d.orig" "${sourceslist}.d" for file in $(find chroot/var/lib/apt/lists/ -name ftpmaster.internal*); do rm $file done