From owner-svn-src-all@FreeBSD.ORG  Wed Apr 22 10:25:09 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 112C0634;
 Wed, 22 Apr 2015 10:25:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 F227A1D6F;
 Wed, 22 Apr 2015 10:25:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3MAP8SX036882;
 Wed, 22 Apr 2015 10:25:08 GMT (envelope-from pluknet@FreeBSD.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3MAP8kF036881;
 Wed, 22 Apr 2015 10:25:08 GMT (envelope-from pluknet@FreeBSD.org)
Message-Id: <201504221025.t3MAP8kF036881@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pluknet set sender to
 pluknet@FreeBSD.org using -f
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Wed, 22 Apr 2015 10:25:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r281847 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Apr 2015 10:25:09 -0000

Author: pluknet
Date: Wed Apr 22 10:25:08 2015
New Revision: 281847
URL: https://svnweb.freebsd.org/changeset/base/281847

Log:
  Fix r281843 mis-merge.
  
  Reported by:	Thomas Mueller tmueller at sysgo com

Modified:
  stable/10/sys/kern/init_main.c

Modified: stable/10/sys/kern/init_main.c
==============================================================================
--- stable/10/sys/kern/init_main.c	Wed Apr 22 09:52:51 2015	(r281846)
+++ stable/10/sys/kern/init_main.c	Wed Apr 22 10:25:08 2015	(r281847)
@@ -708,7 +708,7 @@ start_init(void *dummy)
 	vfs_mountroot();
 
 	/* Wipe GELI passphrase from the environment. */
-	kern_unsetenv("kern.geom.eli.passphrase");
+	unsetenv("kern.geom.eli.passphrase");
 
 	/*
 	 * Need just enough stack to hold the faked-up "execve()" arguments.