Skip to content
/ src Public

Commit 5d9c32b

Browse files
committed
Stop parsing unsupported dhcp-options(5)
dhcpleased(8) does not support everything dhclient(8) did, so stop pretending. OK florian
1 parent 047d933 commit 5d9c32b

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

distrib/miniroot/install.sub

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/ksh
2-
# $OpenBSD: install.sub,v 1.1173 2021/08/24 21:50:09 bluhm Exp $
2+
# $OpenBSD: install.sub,v 1.1174 2021/08/29 13:05:43 kn Exp $
33
#
44
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
55
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -629,14 +629,13 @@ get_responsefile() {
629629
fi
630630

631631
# Extract installer mode and response file path from lease file.
632-
_aifile=$(lease_value $_lf filename bootfile-name)
632+
_aifile=$(lease_value $_lf filename)
633633
[[ $_aifile == ?(*/)auto_@(install|upgrade) ]] || _aifile=
634634
_path=${_aifile%auto_@(install|upgrade)}
635635
AI_MODE=${_aifile##*?(/)auto_}
636636

637637
# Extract install server ip address from lease file.
638-
AI_SERVER=$(lease_value $_lf \
639-
server-name tftp-server-name next-server)
638+
AI_SERVER=$(lease_value $_lf next-server)
640639

641640
# Prime hostname with host-name option from lease file.
642641
AI_HOSTNAME=$(lease_value $_lf host-name)

0 commit comments

Comments
 (0)