diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-09-30 09:42:13 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-09-30 09:43:58 +0200 |
| commit | 880e6e07364a405ed225416a1c020d8dc0918db2 (patch) | |
| tree | feddec5c2e6daa8cb241f4d5bd3ead84a23a077d /scripts/build/chroot_resolv | |
| parent | 5e4f7742c5dd3381701c54fe7a7a6bb34fa60e9c (diff) | |
| download | vyos-live-build-880e6e07364a405ed225416a1c020d8dc0918db2.tar.gz vyos-live-build-880e6e07364a405ed225416a1c020d8dc0918db2.zip | |
Adding slightly modified patch from Adam Conrad <adconrad@ubuntu.com> to remove resolvconf artifacts.
Diffstat (limited to 'scripts/build/chroot_resolv')
| -rwxr-xr-x | scripts/build/chroot_resolv | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv index b82e3667a..42ba07161 100755 --- a/scripts/build/chroot_resolv +++ b/scripts/build/chroot_resolv @@ -90,6 +90,13 @@ case "${1}" in Truncate chroot/etc/resolv.conf fi + # Clean up resolvconf's pollution + if [ -e chroot/etc/resolvconf/resolv.conf.d ] + then + rm -f chroot/etc/resolvconf/resolv.conf.d/original + rm -f chroot/etc/resolvconf/resolv.conf.d/tail + fi + # Removing stage file rm -f .build/chroot_resolv ;; |