From owner-svn-src-all@FreeBSD.ORG  Sun Feb 27 19:44:10 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 781CC106566C;
	Sun, 27 Feb 2011 19:44:10 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6666F8FC0C;
	Sun, 27 Feb 2011 19:44:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1RJiAGE000479;
	Sun, 27 Feb 2011 19:44:10 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1RJiAEK000476;
	Sun, 27 Feb 2011 19:44:10 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201102271944.p1RJiAEK000476@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 27 Feb 2011 19:44:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219090 - in head: . etc/rc.d
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 27 Feb 2011 19:44:10 -0000

Author: pjd
Date: Sun Feb 27 19:44:10 2011
New Revision: 219090
URL: http://svn.freebsd.org/changeset/base/219090

Log:
  Commit two more files missed in r219089.
  
  MFC after:	1 month

Modified:
  head/Makefile.inc1
  head/etc/rc.d/zvol

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sun Feb 27 19:41:40 2011	(r219089)
+++ head/Makefile.inc1	Sun Feb 27 19:44:10 2011	(r219090)
@@ -1153,6 +1153,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \
+		${_cddl_lib_libumem} \
 		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
 		${_secure_lib_libssl}
@@ -1166,6 +1167,7 @@ _generic_libs=	${_cddl_lib} gnu/lib ${_k
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
 .if ${MK_CDDL} != "no"
+_cddl_lib_libumem= cddl/lib/libumem
 _cddl_lib= cddl/lib
 .endif
 

Modified: head/etc/rc.d/zvol
==============================================================================
--- head/etc/rc.d/zvol	Sun Feb 27 19:41:40 2011	(r219089)
+++ head/etc/rc.d/zvol	Sun Feb 27 19:44:10 2011	(r219090)
@@ -17,7 +17,6 @@ required_modules="zfs"
 
 zvol_start()
 {
-	zfs volinit
 	# Enable swap on ZVOLs with property org.freebsd:swap=on.
 	zfs list -H -o org.freebsd:swap,name -t volume | \
 	while read state name; do
@@ -40,7 +39,6 @@ zvol_stop()
 			;;
 		esac
 	done
-	zfs volfini
 }
 
 load_rc_config $name