Skip to content

Commit

Permalink
Fix dialog autosizing in bsdinstall hostname
Browse files Browse the repository at this point in the history
Sponsored by:	Smule, Inc.
  • Loading branch information
devinteske committed Oct 26, 2018
1 parent 5efca36 commit 05b1c42
Showing 1 changed file with 81 additions and 15 deletions.
96 changes: 81 additions & 15 deletions usr.sbin/bsdinstall/scripts/hostname
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
#-
# Copyright (c) 2011 Nathan Whitehorn
# Copyright (c) 2015 Devin Teske
# Copyright (c) 2015-2018 Devin Teske
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Expand All @@ -26,27 +26,93 @@
# SUCH DAMAGE.
#
# $FreeBSD$
#
############################################################ INCLUDES

BSDCFG_SHARE="/usr/share/bsdconfig"
. $BSDCFG_SHARE/common.subr || exit 1
f_dprintf "%s: loading_includes..." "$0"
f_include $BSDCFG_SHARE/dialog.subr

############################################################ CONFIGURATION

#
# Default value
#
: ${HOSTNAME=$( hostname )}

#
# Default file to store hostname entry in
#
: ${HOSTNAMEFILE:=$BSDINSTALL_TMPETC/rc.conf.hostname}

############################################################ GLOBALS

#
# Strings that should be moved to an i18n file and loaded with f_include_lang()
#
msg_set_hostname="Set Hostname"
msg_please_choose_a_hostname="Please choose a hostname for this machine.\n\nIf you are running on a managed network, please ask\nyour network administrator for an appropriate name."
msg_ok="OK"
msg_freebsd_installer="FreeBSD Installer"

############################################################ FUNCTIONS

# dialog_hostname
#
# Display input box (without cancel button) for user to enter desired hostname.
#
dialog_hostname()
{
local prompt="$msg_please_choose_a_hostname"
local hline=
local value="$*"

local height width
f_dialog_inputbox_size height width \
"$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$prompt" "$value" "$hline"

$DIALOG \
--title "$DIALOG_TITLE" \
--backtitle "$DIALOG_BACKTITLE" \
--hline "$hline" \
--ok-label "$msg_ok" \
--no-cancel \
--inputbox "$prompt" \
$height $width "$value" \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
}

: ${DIALOG_OK=0}
: ${DIALOG_CANCEL=1}
: ${DIALOG_HELP=2}
: ${DIALOG_EXTRA=3}
: ${DIALOG_ITEM_HELP=4}
: ${DIALOG_ESC=255}
############################################################ MAIN

exec 3>&1
HOSTNAME=`dialog --backtitle 'FreeBSD Installer' --title 'Set Hostname' --nocancel --inputbox \
'Please choose a hostname for this machine.
#
# Initialize
#
f_dialog_title "$msg_set_hostname"
f_dialog_backtitle "$msg_freebsd_installer"

If you are running on a managed network, please ask your network administrator for an appropriate name.' \
0 0 $(hostname) 2>&1 1>&3`
if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi
exec 3>&-
#
# Get user input
#
HOSTNAME=$( dialog_hostname "$HOSTNAME" )
[ $? -eq $DIALOG_CANCEL ] && exit 1

echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname
#
# Store the user's choice
#
echo "hostname=\"$HOSTNAME\"" > "$HOSTNAMEFILE"
retval=$?

#
# Activate entry if configured
#
if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
hostname -s "$HOSTNAME"
retval=$?
fi

exit $retval

################################################################################
# END
################################################################################

0 comments on commit 05b1c42

Please sign in to comment.