Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 19:31:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Imported using git-ubuntu import.

Changelog parent: dbe0e70d40245f167f344aeaf2b33e5119424839

New changelog entries:
  * fix resolv.conf for ubuntu-touch initramfs creation
This commit is contained in:
Oliver Grawert 2013-05-29 12:10:53 +02:00 committed by usd-importer
parent dbe0e70d40
commit 49c4a4c659
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.139) saucy; urgency=low
* fix resolv.conf for ubuntu-touch initramfs creation
-- Oliver Grawert <ogra@ubuntu.com> Wed, 29 May 2013 12:10:53 +0200
livecd-rootfs (2.138) saucy; urgency=low
* also move the sources.list.d dir out of the way on ubuntu-touch

12
live-build/auto/build
View File

@ -412,6 +412,13 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
lb chroot_sysfs install "$@"
lb chroot_devpts install "$@"
if [ -e chroot/etc/resolv.conf ]; then
mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
fi
if [ -e /etc/resolv.conf ]; then
cp /etc/resolv.conf chroot/etc/resolv.conf
fi
mv "${sourceslist}" "${sourceslist}.orig"
mv "${sourceslist}.d" "${sourceslist}.d.orig"
echo "deb http://ftpmaster.internal/ubuntu/ $codename main universe" >$sourceslist
@ -445,6 +452,11 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
for file in $(find chroot/var/lib/apt/lists/ -name ftpmaster.internal*); do
rm $file
done
if [ -e chroot/etc/resolv.conf.orig ]; then
mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
else
rm chroot/etc/resolv.conf
fi
fi
# LTSP chroot building (only in 32bit and for Edubuntu (DVD))