Mercurial > hg > aboriginal
changeset 836:f448815e20b0
Vladimir Dronnikov requested init.sh not overwrite resolv.conf unnecessarily.
author | Rob Landley <rob@landley.net> |
---|---|
date | Tue, 06 Oct 2009 08:58:56 -0500 |
parents | f0b5901bca48 |
children | 3cd64af0d1b6 |
files | sources/native/sbin/init.sh |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/sources/native/sbin/init.sh Sun Oct 04 21:53:36 2009 -0500 +++ b/sources/native/sbin/init.sh Tue Oct 06 08:58:56 2009 -0500 @@ -56,7 +56,8 @@ # If we're not PID 1, it's probably a chroot. else - echo "nameserver 4.2.2.1" > /etc/resolv.conf + [ ! -z $(grep "default for QEMU" /etc/resolv.conf) ] && + echo "nameserver 4.2.2.1" > /etc/resolv.conf # Switch to a shell with command history.