Import patches-unapplied version 2.249 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: e11f18b965f1af115101493aba8f091a1a873fb6

New changelog entries:
  * live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Remove
    pre-existing /etc/resolv.conf.
This commit is contained in:
James Hunt 2014-10-06 13:25:11 +01:00 committed by usd-importer
parent e11f18b965
commit 32cc9da6c0
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.249) utopic; urgency=medium
* live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Remove
pre-existing /etc/resolv.conf.
-- James Hunt <james.hunt@ubuntu.com> Mon, 06 Oct 2014 13:25:11 +0100
livecd-rootfs (2.248) utopic; urgency=medium
* live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Configure

View File

@ -1,3 +1,3 @@
#!/bin/sh -x
ln -s /run/resolvconf/resolv.conf /etc/resolv.conf
ln -fs /run/resolvconf/resolv.conf /etc/resolv.conf