Import patches-unapplied version 2.140 to ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: 49c4a4c6593e3f1f0148c5bf281f744113a06d2e

New changelog entries:
  *  hardcode dist in the temporary sources.list of the ubuntu-touch initrd
     creation for a test
This commit is contained in:
Oliver Grawert 2013-05-29 14:20:34 +02:00 committed by usd-importer
parent 49c4a4c659
commit 8ee97385eb
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.140) saucy; urgency=low
* hardcode dist in the temporary sources.list of the ubuntu-touch initrd
creation for a test
-- Oliver Grawert <ogra@ubuntu.com> Wed, 29 May 2013 14:20:34 +0200
livecd-rootfs (2.139) saucy; urgency=low
* fix resolv.conf for ubuntu-touch initramfs creation

View File

@ -421,7 +421,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
mv "${sourceslist}" "${sourceslist}.orig"
mv "${sourceslist}.d" "${sourceslist}.d.orig"
echo "deb http://ftpmaster.internal/ubuntu/ $codename main universe" >$sourceslist
echo "deb http://ftpmaster.internal/ubuntu/ saucy main universe" >$sourceslist
Chroot chroot "apt-get -y update"
for subarch in $touchsubarches; do