From 1899183cf3bc71e5df86949cb0aa1a575b9677f0 Mon Sep 17 00:00:00 2001 From: tb <> Date: Sun, 12 Nov 2017 21:58:00 +0000 Subject: [PATCH] Remove HN_DIR variable and expand it in the only place it was used. It currently serves no purpose. ok rpe, agreement from deraadt and halex --- src/etc/netstart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/etc/netstart b/src/etc/netstart index 3b8c6a27..1d2d16b2 100644 --- a/src/etc/netstart +++ b/src/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.186 2017/07/25 21:17:11 rpe Exp $ +# $OpenBSD: netstart,v 1.187 2017/11/12 21:58:00 tb Exp $ # Turn off Strict Bourne shell mode. set +o sh @@ -75,7 +75,7 @@ parse_hn_line() { # Start a single interface. # Usage: ifstart if1 ifstart() { - local _if=$1 _hn=$HN_DIR/hostname.$1 _cmds _i=0 _line _stat + local _if=$1 _hn=/etc/hostname.$1 _cmds _i=0 _line _stat set -A _cmds # Interface names must be alphanumeric only. We check to avoid @@ -163,7 +163,6 @@ defaultroute() { FUNCS_ONLY=1 . /etc/rc.d/rc.subr _rc_parse_conf -HN_DIR=${HN_DIR:-/etc} PRINT_ONLY=false USAGE="USAGE: ${0##*/} [-n] [interface ...]" V4_DHCPCONF=false