diff options
| author |   krw <krw@openbsd.org> | 2002-03-19 12:16:13 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2002-03-19 12:16:13 +0000 |
| commit | 33d85333bbaf3a21a56b1395c7ef906c8159a627 (patch) | |
| tree | ea220e9ca5d1451f28c381d34ae9203ccf0e7b63 | |
| parent | tweak gcc inliner. More weight for leaf functions. Less depth for other (diff) | |
| download | wireguard-openbsd-33d85333bbaf3a21a56b1395c7ef906c8159a627.tar.xz wireguard-openbsd-33d85333bbaf3a21a56b1395c7ef906c8159a627.zip | |
Save more dhclient configuration info during installation.
In particular
a) save dhclient.leases so the lease obtained during installation
is retained.
b) create /etc/resolv.conf.tail with 'lookup file bind' so that
the resolv.conf files created by dhclient have the same settings
as the default resolv.conf we install. i.e. use the /etc/hosts
file before trying bind.
ok millert@
| -rw-r--r-- | distrib/miniroot/install.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index cc46ba65f1f..42c95b317e2 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.85 2002/03/17 03:04:47 krw Exp $ +# $OpenBSD: install.sh,v 1.86 2002/03/19 12:16:13 krw Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback @@ -386,8 +386,11 @@ done echo "...done." if [ -f /etc/dhclient.conf ]; then - echo -n "Modifying dhclient.conf..." + echo -n "Saving dhclient configuration..." cat /etc/dhclient.conf >> /mnt/etc/dhclient.conf + echo "lookup file bind" > /mnt/etc/resolv.conf.tail + cp /var/db/dhclient.leases /mnt/var/db/. + echo "done." fi # If no zoneinfo on the installfs, give them a second chance |