From 849b4a9bfd33a2b9e8ef1fdc6c564d576bdb9a4f Mon Sep 17 00:00:00 2001
From: dteske <dteske@FreeBSD.org>
Date: Fri, 26 Oct 2018 01:06:03 +0000
Subject: [PATCH] Add improved error checking to bsdinstall hostname

Sponsored by:	Smule, Inc.
---
 usr.sbin/bsdinstall/scripts/hostname | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/bsdinstall/scripts/hostname b/usr.sbin/bsdinstall/scripts/hostname
index 0ea5d5440db..4fbce415e65 100755
--- a/usr.sbin/bsdinstall/scripts/hostname
+++ b/usr.sbin/bsdinstall/scripts/hostname
@@ -56,6 +56,12 @@ msg_please_choose_a_hostname="Please choose a hostname for this machine.\n\nIf y
 msg_ok="OK"
 msg_freebsd_installer="FreeBSD Installer"
 
+#
+# Command strings for various tasks
+#
+ECHO_OVERWRITE='echo "%s" > "%s"'
+SET_HOSTNAME='hostname -s "%s"'
+
 ############################################################ FUNCTIONS
 
 # dialog_hostname
@@ -100,14 +106,15 @@ HOSTNAME=$( dialog_hostname "$HOSTNAME" )
 #
 # Store the user's choice
 #
-echo "hostname=\"$HOSTNAME\"" > "$HOSTNAMEFILE"
+f_eval_catch "$pgm" echo "$ECHO_OVERWRITE" \
+	'hostname=\"$HOSTNAME\"' "$HOSTNAMEFILE"
 retval=$?
 
 #
 # Activate entry if configured
 #
 if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
-	hostname -s "$HOSTNAME"
+	f_eval_catch "$pgm" hostname "$SET_HOSTNAME" "$HOSTNAME"
 	retval=$?
 fi
 
-- 
2.45.0