From owner-svn-src-head@freebsd.org Fri Sep 11 20:56:37 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F0FBA01ED2; Fri, 11 Sep 2015 20:56:37 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F3AAB18DC; Fri, 11 Sep 2015 20:56:36 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8BKuaYT041352; Fri, 11 Sep 2015 20:56:36 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8BKuaqq041351; Fri, 11 Sep 2015 20:56:36 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201509112056.t8BKuaqq041351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Fri, 11 Sep 2015 20:56:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287686 - head/usr.sbin/bsdinstall/scripts X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Sep 2015 20:56:37 -0000 Author: dteske Date: Fri Sep 11 20:56:36 2015 New Revision: 287686 URL: https://svnweb.freebsd.org/changeset/base/287686 Log: Produce meaningful exit code MFC after: 3 days X-MFC-to: stable/10 Modified: head/usr.sbin/bsdinstall/scripts/hostname Modified: head/usr.sbin/bsdinstall/scripts/hostname ============================================================================== --- head/usr.sbin/bsdinstall/scripts/hostname Fri Sep 11 20:45:41 2015 (r287685) +++ head/usr.sbin/bsdinstall/scripts/hostname Fri Sep 11 20:56:36 2015 (r287686) @@ -43,6 +43,9 @@ if [ $? -eq $DIALOG_CANCEL ]; then exit exec 3>&- echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname -if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then +retval=$? +if [ "$BSDINSTALL_CONFIGCURRENT" ]; then hostname -s "$HOSTNAME" + retval=$? fi +exit $retval